diff --git a/Makefile.msvc b/Makefile.msvc index a0b52e4..7fedec3 100644 --- a/Makefile.msvc +++ b/Makefile.msvc @@ -8,13 +8,13 @@ BUILDDIR = ../bin/ CC = cl -CFLAGS = /nologo /MT /W3 /Ox /GS /EHs- /GA /GF /D "MSVC" /D "WITH_STD_MALLOC" /D "WITH_WSAPOLL" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "PRINTF_INT64_MODIFIER=\"I64\"" /Fp"proxy.pch" /FD /c $(VERSION) $(BUILDDATE) +CFLAGS = /nologo /MT /W3 /Ox /GS /EHs- /GA /GF /D "MSVC" /D "WITH_STD_MALLOC" /D "WITH_WSAPOLL" /D "NDEBUG" /D "WIN32" /D "WITH_SSL" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "PRINTF_INT64_MODIFIER=\"I64\"" /Fp"proxy.pch" /FD /c $(VERSION) $(BUILDDATE) COUT = /Fo LN = link LDFLAGS = /nologo /subsystem:console /incremental:no /machine:I386 DLFLAGS = /DLL DLSUFFICS = .dll -LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib libeay32.lib ssleay32.lib +LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib libcrypto_static.lib libssl_static.lib LIBSOLD = libeay32MT.lib ssleay32MT.lib LIBSPREFIX = LIBSSUFFIX = .lib diff --git a/Makefile.msvc64 b/Makefile.msvc64 index 0fdaaf2..1d0ed0e 100644 --- a/Makefile.msvc64 +++ b/Makefile.msvc64 @@ -8,13 +8,13 @@ BUILDDIR = ../bin64/ CC = cl -CFLAGS = /nologo /MT /W3 /Ox /EHs- /GS /GA /GF /D "MSVC" /D "WITH_STD_MALLOC" /D "WITH_WSAPOLL" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "PRINTF_INT64_MODIFIER=\"I64\"" /Fp"proxy.pch" /FD /c $(VERSION) $(BUILDDATE) +CFLAGS = /nologo /MT /W3 /Ox /EHs- /GS /GA /GF /D "MSVC" /D "WITH_STD_MALLOC" /D "WITH_SSL" /D "WITH_WSAPOLL" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "PRINTF_INT64_MODIFIER=\"I64\"" /Fp"proxy.pch" /FD /c $(VERSION) $(BUILDDATE) COUT = /Fo LN = link LDFLAGS = /nologo /subsystem:console /incremental:no /machine:x64 DLFLAGS = /DLL DLSUFFICS = .dll -LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib libeay32.lib ssleay32.lib +LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib libcrypto_static.lib libssl_static.lib LIBSOLD = libeay32.lib ssleay32.lib LIBSPREFIX = LIBSSUFFIX = .lib diff --git a/Makefile.msvcARM64 b/Makefile.msvcARM64 index 0708fe2..43c559f 100644 --- a/Makefile.msvcARM64 +++ b/Makefile.msvcARM64 @@ -8,13 +8,13 @@ BUILDDIR = ../bin64/ CC = cl -CFLAGS = /nologo /MT /W3 /Ox /EHs- /GS /GA /GF /D "MSVC" /D "WITH_STD_MALLOC" /D "WITH_WSAPOLL" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "PRINTF_INT64_MODIFIER=\"I64\"" /Fp"proxy.pch" /FD /c $(VERSION) $(BUILDDATE) +CFLAGS = /nologo /MT /W3 /Ox /EHs- /GS /GA /GF /D "MSVC" /D "WITH_STD_MALLOC" /D "WITH_WSAPOLL" /D "WITH_SSL" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "PRINTF_INT64_MODIFIER=\"I64\"" /Fp"proxy.pch" /FD /c $(VERSION) $(BUILDDATE) COUT = /Fo LN = link LDFLAGS = /nologo /subsystem:console /incremental:no /machine:arm64 DLFLAGS = /DLL DLSUFFICS = .dll -LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib +LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib libcrypto_static.lib libssl_static.lib LIBSOLD = LIBSPREFIX = LIBSSUFFIX = .lib @@ -28,7 +28,7 @@ REMOVECOMMAND = del 2>NUL >NUL TYPECOMMAND = type COMPATLIBS = MAKEFILE = Makefile.msvcARM64 -PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin FilePlugin +PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin FilePlugin SSLPlugin VERFILE = 3proxy.res $(VERFILE) VERSIONDEP = 3proxy.res $(VERSIONDEP) AFTERCLEAN = del src\*.res diff --git a/README b/README index 29df0d7..1d104e6 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ # 3APA3A 3proxy tiny proxy server -(c) 2002-2020 by Vladimir '3APA3A' Dubrovin <3proxy@3proxy.ru> +(c) 2002-2021 by Vladimir '3APA3A' Dubrovin <3proxy@3proxy.org> Branches: diff --git a/RELEASE b/RELEASE index b3ec163..2bd77c7 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -0.9.3 \ No newline at end of file +0.9.4 \ No newline at end of file diff --git a/authors b/authors index fb31660..a8f7522 100644 --- a/authors +++ b/authors @@ -1 +1 @@ -(c) 2002-2019 by Vladimir '3APA3A' Dubrovin \ No newline at end of file +(c) 2002-2021 by Vladimir '3APA3A' Dubrovin \ No newline at end of file diff --git a/copying b/copying index 6a0ce50..40351c1 100644 --- a/copying +++ b/copying @@ -2,7 +2,7 @@ (c) 2000-2020 by 3APA3A (3APA3A@3proxy.ru) (c) 2000-2020 by 3proxy.org (https://3proxy.org/) -(c) 2000-2020 by Vladimir Dubrovin (vlad@3proxy.ru) +(c) 2000-2020 by Vladimir Dubrovin (vlad@3proxy.org) THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -38,20 +38,20 @@ terms of compatible license, including: 1. Apache License, Version 2.0 or (at your option) any later version You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 2. GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. You may obtain a copy of the License at - http://www.gnu.org/licenses/gpl.txt + https://www.gnu.org/licenses/gpl.txt 3. GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. You may obtain a copy of the License at - http://www.gnu.org/licenses/lgpl.txt + https://www.gnu.org/licenses/lgpl.txt diff --git a/debian/3proxy.manpages b/debian/3proxy.manpages new file mode 100644 index 0000000..f6a505e --- /dev/null +++ b/debian/3proxy.manpages @@ -0,0 +1,10 @@ +man/3proxy.8 +man/3proxy.cfg.3 +man/ftppr.8 +man/icqpr.8 +man/pop3p.8 +man/proxy.8 +man/smtpp.8 +man/socks.8 +man/tcppm.8 +man/udppm.8 \ No newline at end of file diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..5d48b5d --- /dev/null +++ b/debian/changelog @@ -0,0 +1,18 @@ +3proxy (0.9.3-210629140419) buster; urgency=medium + + *3proxy 0.9.3 build + + -- z3APA3A <3apa3a@3proxy.org> Thu, 01 Jul 2021 19:48:44 +0300 + +3proxy (0.9.3-1) buster; urgency=medium + + *3proxy 0.9.3 initial build + + -- z3APA3A <3apa3a@3proxy.org> Thu, 03 Dec 2020 21:13:58 +0300 + +3proxy (0.9.2-1) buster; urgency=medium + + *3proxy 0.9.2 initial build + + -- z3APA3A <3apa3a@3proxy.org> Thu, 19 Nov 2020 19:19:19 +0300 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..f11c82a --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 \ No newline at end of file diff --git a/debian/conffiles b/debian/conffiles new file mode 100644 index 0000000..5511217 --- /dev/null +++ b/debian/conffiles @@ -0,0 +1,4 @@ +/usr/local/3proxy/conf/3proxy.cfg +/usr/local/3proxy/conf/add3proxyuser.sh +/usr/local/3proxy/conf/bandlimiters +/usr/local/3proxy/conf/counters diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..30ec490 --- /dev/null +++ b/debian/control @@ -0,0 +1,18 @@ +Source: 3proxy +Maintainer: z3APA3A <3apa3a@3proxy.org> +Section: net +Priority: optional +Standards-Version: 4.0.0 +Build-Depends: debhelper (>=10) +Homepage: https://3proxy.org/ +Vcs-Git: https://github.com/z3APA3A/3proxy +Vcs-Browser: https://github.com/z3APA3A/3proxy + +Package: 3proxy +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: tiny free proxy server + 3Proxy tiny free proxy server is really tiny freeware proxy servers set. + It includes HTTP proxy with HTTPS and FTP support, SOCKSv4/SOCKSv4.5/SOCKSv5 proxy (socks/socks.exe), POP3 proxy, SMTP proxy, FTP proxy, caching DNS proxy, TCP and UDP portmappers. + You can use every proxy as a standalone program (socks, proxy, tcppm, udppm, pop3p) or use combined program (3proxy). Combined proxy additionally supports features like access control, bandwidth limiting, limiting daily/weekly/monthly traffic amount, proxy chaining, log rotation, syslog and ODBC logging, etc. + It's created to be small, simple and yet very functional. \ No newline at end of file diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..f6f657a --- /dev/null +++ b/debian/copyright @@ -0,0 +1,20 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: 3proxy +Upstream-Contact: 3proxy@3proxy.org +Source: https://3proxy.org/ + +Files: * +Copyright: 2000-2020 3APA3A, Vladimir Dubrovin, 3proxy.org +License: BSD-3-clause or Apache or GPL-2+ or LGPL-2+ + +Files: src/libs/md*.* +Copyright: 1990,1991,1992 RSA Data Security, Inc +License: public-domain + +Files: src/libs/regex.* +Copyright: Henry Spencer +License: public-domain + +Files: src/libs/smbdes.c +Copyright: Andrew Tridgell 1998 +License: GPL-2+ diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..dbdbe4b --- /dev/null +++ b/debian/postinst @@ -0,0 +1,43 @@ +if [ ! -f /usr/local/3proxy/conf/passwd ]; then \ + touch /usr/local/3proxy/conf/passwd;\ +fi +chown -R proxy:proxy /usr/local/3proxy +chmod 550 /usr/local/3proxy/ +chmod 550 /usr/local/3proxy/conf/ +chmod 440 /usr/local/3proxy/conf/* +if /bin/systemctl >/dev/null 2>&1; then \ + /usr/sbin/update-rc.d 3proxy disable || true; \ + /usr/sbin/chkconfig 3proxy off || true; \ + /bin/systemctl enable 3proxy.service; \ +elif [ -x /usr/sbin/update-rc.d ]; then \ + /usr/sbin/update-rc.d 3proxy defaults; \ + /usr/sbin/update-rc.d 3proxy enable; \ +elif [ -x /usr/sbin/chkconfig ]; then \ + /usr/sbin/chkconfig 3proxy on; \ +fi + +echo "" +echo 3proxy installed. +if /bin/systemctl >/dev/null 2>&1; then \ + /bin/systemctl stop 3proxy.service \ + /bin/systemctl start 3proxy.service \ + echo use ;\ + echo " "systemctl start 3proxy.service ;\ + echo to start proxy ;\ + echo " "systemctl stop 3proxy.service ;\ + echo to stop proxy ;\ +elif [ -x /usr/sbin/service ]; then \ + /usr/sbin/service 3proxy stop || true;\ + /usr/sbin/service 3proxy start || true;\ + echo " "service 3proxy start ;\ + echo to start proxy ;\ + echo " "service 3proxy stop ;\ + echo to stop proxy ;\ +fi +echo " "/usr/local/3proxy/conf/add3proxyuser.sh +echo to add users +echo "" +echo Default config uses Google\'s DNS. +echo It\'s recommended to use provider supplied DNS or install local recursor, e.g. pdns-recursor. +echo Configure preferred DNS in /usr/local/3proxy/conf/3proxy.cfg. +echo run \'/usr/local/3proxy/conf/add3proxyuser.sh admin password\' to configure \'admin\' user diff --git a/debian/preinst b/debian/preinst new file mode 100644 index 0000000..f000a2e --- /dev/null +++ b/debian/preinst @@ -0,0 +1,4 @@ +if [ -x /usr/sbin/useradd ]; then \ + /usr/bin/getent group proxy >/dev/null || (/usr/sbin/groupadd -f -r proxy || true); \ + /usr/bin/getent passwd proxy >/dev/null || (/usr/sbin/useradd -Mr -s /bin/false -g proxy -c 3proxy proxy || true); \ +fi diff --git a/debian/rules b/debian/rules new file mode 100644 index 0000000..dc57dd0 --- /dev/null +++ b/debian/rules @@ -0,0 +1,16 @@ +#!/usr/bin/make -f + +%: + dh $@ + +override_dh_auto_build: + ln -s Makefile.Linux Makefile || true + dh_auto_build + +override_dh_auto_clean: + find src/ -type f -name "*.o" -delete + find src/ -type f -name "Makefile.var" -delete + find bin/ -type f -executable -delete + rm -f Makefile + +override_dh_usrlocal: diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/doc/html/howtoe.html b/doc/html/howtoe.html index 0fffb14..8adcfb0 100644 --- a/doc/html/howtoe.html +++ b/doc/html/howtoe.html @@ -947,7 +947,7 @@ allowed traffic in Megabytes (MB). nocountin allows you to set exclusions.
  • How to obtain latest 3proxy version

    Latest version of 3proxy may be obtained -here. +here. New version may have changes and incompatibilities with previous one in files format or commands. Please, read CHANGELOG file and another documentation before installing new version. diff --git a/doc/html/howtor.html b/doc/html/howtor.html index 708f3bd..3cdee45 100644 --- a/doc/html/howtor.html +++ b/doc/html/howtor.html @@ -1066,9 +1066,9 @@ прокси-серверы для доступа к разным ресурсам. Эта возможность разбирается в статьях
    Microsoft: Q296591 A Description of the Automatic Discovery Feature -
    http://support.microsoft.com/default.aspx?scid=kb;EN-US;296591 +
    http://support.microsoft.com/default.aspx?scid=kb;EN-US;296591
    Netscape: Navigator Proxy Auto-Config File Format -
    http://wp.netscape.com/eng/mozilla/2.0/relnotes/demo/proxy-live.html +
    http://wp.netscape.com/eng/mozilla/2.0/relnotes/demo/proxy-live.html

  • Как настраивать FTP клиент

    Настройка FTP клиента для работы через SOCKS прокси не отличается от настройки @@ -1124,20 +1124,14 @@

  • Как использовать 3proxy с программой, не поддерживающей работу с прокси-сервером

    - Можно использовать любую программу-редиректор, например, - SocksCAP или - FreeCAP. 3proxy поддерживает исходящие + Можно использовать любую программу-редиректор. 3proxy поддерживает исходящие и обратные TCP и UDP соединения, но редиректоры могут иметь свои ограничения, кроме того, некоторые плохо написаные приложения не поддаются "соксификации". Если программе требуется обращаться к небольшому набору серверов (например, игровых), то проблему можно решить с помощью портмаппинга.

  • Как использовать 3proxy с играми

    - Оптимальный варинт - использовать соксификатор (Как использовать - 3proxy с программой, не поддерживающей работу с прокси-сервером). - FreeCap 3.13 проверен с играми на движке - Unreal (включая Unreal Tournament), Half-Life (включая Counter-Strike) и - другими. Если по каким-то причинам соксификатор не работает или недоступен, + Если по каким-то причинам соксификатор не работает или недоступен, то необходимо использовать отображения портов (обычно игры, кроме mood-подобных, работают по протоколу UDP, надо использовать udppm). Нужно иметь ввиду, что для udppm требуется отдельный маппинг для каждого @@ -1162,7 +1156,7 @@

  • Где взять свежую версию

    Свежую версию всегда можно взять - здесь. Обратите внимание, + здесь. Обратите внимание, что в новой версии может измениться порядок лицензирования или команды конфигурации, поэтому прежде чем устанавливать новую версии программы обязательно ознакомьтесь с документацией. diff --git a/man/3proxy.8 b/man/3proxy.8 index 0a26479..66cd39e 100644 --- a/man/3proxy.8 +++ b/man/3proxy.8 @@ -138,7 +138,7 @@ wget to automate this task. configuration file .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy.cfg(3), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), kill(1), syslogd(8), @@ -148,4 +148,4 @@ https://3proxy.org/ 3APA3A is pronounced as \`\`zaraza\'\'. .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/man/3proxy.cfg.3 b/man/3proxy.cfg.3 index 047ad27..c29d5c3 100644 --- a/man/3proxy.cfg.3 +++ b/man/3proxy.cfg.3 @@ -1055,7 +1055,7 @@ corruption and/or Content-Length chaging. Default is 1MB (1048576). .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8), .br @@ -1064,4 +1064,4 @@ Report all bugs to 3APA3A is pronounced as \`\`zaraza\'\'. .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/man/ftppr.8 b/man/ftppr.8 index 3f477aa..0ad5216 100644 --- a/man/ftppr.8 +++ b/man/ftppr.8 @@ -77,11 +77,11 @@ is user\'s login on this FTP server. Login itself may contain \'@\' sign. Only cleartext authentication is currently supported. .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy(8), proxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8), .br https://3proxy.org/ .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/man/pop3p.8 b/man/pop3p.8 index 338337b..7bfa230 100644 --- a/man/pop3p.8 +++ b/man/pop3p.8 @@ -73,11 +73,11 @@ authentication (APOP, CRAM-MD5, etc) requires challenge from server before we know which server to connect. .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8), .br https://3proxy.org/ .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/man/proxy.8 b/man/proxy.8 index 4ddbf17..eaa2252 100644 --- a/man/proxy.8 +++ b/man/proxy.8 @@ -68,11 +68,11 @@ limit clients, use instead. .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8), .br https://3proxy.org/ .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/man/smtpp.8 b/man/smtpp.8 index 6669509..bd14e30 100644 --- a/man/smtpp.8 +++ b/man/smtpp.8 @@ -74,11 +74,11 @@ authentication (CRAM-MD5, SPA, etc) requires challenge from server before we know which server to connect. .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8), .br https://3proxy.org/ .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/man/socks.8 b/man/socks.8 index 8a7960c..6bc127b 100644 --- a/man/socks.8 +++ b/man/socks.8 @@ -74,11 +74,11 @@ sufficient privileges). If you need to control access use instead. .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy(8), proxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8), .br https://3proxy.org/ .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/man/tcppm.8 b/man/tcppm.8 index de65ec5..42929ee 100644 --- a/man/tcppm.8 +++ b/man/tcppm.8 @@ -63,11 +63,11 @@ as a destination in client application. Connection is forwarded to .IR remote_host : remote_port .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8), .br https://3proxy.org/ .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/man/udppm.8 b/man/udppm.8 index 9f704c8..2ae8db4 100644 --- a/man/udppm.8 +++ b/man/udppm.8 @@ -69,11 +69,11 @@ as a destination in client application. All datagrams are forwarded to .IR remote_host : remote_port .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8), .br https://3proxy.org/ .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/rus.3ps b/rus.3ps index c55d3cd..9c91621 100644 --- a/rus.3ps +++ b/rus.3ps @@ -95,7 +95,7 @@ value {\n [end]










    \n

    
    -(c)3APA3A, Владимир Дубровин и 3proxy.ru\n
    +(c)3APA3A, Владимир Дубровин и 3proxy.ru\n
     \n
     
     [end]
    diff --git a/scripts/debian/3proxy.manpages b/scripts/debian/3proxy.manpages
    index f6a505e..13e77e1 100644
    --- a/scripts/debian/3proxy.manpages
    +++ b/scripts/debian/3proxy.manpages
    @@ -1,7 +1,6 @@
     man/3proxy.8
     man/3proxy.cfg.3
     man/ftppr.8
    -man/icqpr.8
     man/pop3p.8
     man/proxy.8
     man/smtpp.8
    diff --git a/scripts/debian/changelog b/scripts/debian/changelog
    index a17b770..bd5a6b4 100644
    --- a/scripts/debian/changelog
    +++ b/scripts/debian/changelog
    @@ -1,3 +1,9 @@
    +3proxy (0.9.4-1) buster; urgency=medium
    +
    +  *3proxy 0.9.4 initial build
    +
    + -- z3APA3A <3apa3a@3proxy.org>  Fri, 02 Jul 2021 00:47:00 +0300
    +
     3proxy (0.9.3-1) buster; urgency=medium
     
       *3proxy 0.9.3 initial build
    diff --git a/scripts/rh/3proxy.spec b/scripts/rh/3proxy.spec
    index fb3468e..a00da9d 100644
    --- a/scripts/rh/3proxy.spec
    +++ b/scripts/rh/3proxy.spec
    @@ -1,5 +1,5 @@
     Name:           3proxy
    -Version:        0.9.3
    +Version:        0.9.4
     Release:        1
     Summary:        3proxy tiny proxy server
     License:        GPL/LGPL/Apache/BSD
    @@ -51,7 +51,6 @@ make clean
     /usr/share/man/man3/3proxy.cfg.3
     /usr/share/man/man8/3proxy.8
     /usr/share/man/man8/ftppr.8
    -/usr/share/man/man8/icqpr.8
     /usr/share/man/man8/pop3p.8
     /usr/share/man/man8/proxy.8
     /usr/share/man/man8/smtpp.8
    @@ -62,7 +61,6 @@ make clean
     /usr/share/man/man3/3proxy.cfg.3.gz
     /usr/share/man/man8/3proxy.8.gz
     /usr/share/man/man8/ftppr.8.gz
    -/usr/share/man/man8/icqpr.8.gz
     /usr/share/man/man8/pop3p.8.gz
     /usr/share/man/man8/proxy.8.gz
     /usr/share/man/man8/smtpp.8.gz
    diff --git a/src/3proxy.c b/src/3proxy.c
    index cef14f7..9082f50 100644
    --- a/src/3proxy.c
    +++ b/src/3proxy.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    @@ -12,6 +12,11 @@
     #ifndef NOPLUGINS
     #include 
     #endif
    +#else
    +#ifdef WITH_SSL
    +#include 
    +#endif
    +
     #endif
     
     #ifndef DEFAULTCONFIG
    diff --git a/src/3proxy.rc b/src/3proxy.rc
    index 041646d..e65242c 100644
    --- a/src/3proxy.rc
    +++ b/src/3proxy.rc
    @@ -10,7 +10,7 @@ BEGIN
         BEGIN
             BLOCK "040904E4"
             BEGIN
    -            VALUE "Comments", "3proxy - tiny proxy server, http://3proxy.org/\0"
    +            VALUE "Comments", "3proxy - tiny proxy server, https://3proxy.org/\0"
                 VALUE "CompanyName", "Vladimir Dubrovin\0"
                 VALUE "FileDescription", "3proxy - tiny proxy server\0"
                 VALUE "FileVersion", RELEASE3PROXY
    diff --git a/src/auth.c b/src/auth.c
    index a9a3040..237e5f4 100644
    --- a/src/auth.c
    +++ b/src/auth.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/authradius.c b/src/authradius.c
    index 862e02d..42fc7ff 100644
    --- a/src/authradius.c
    +++ b/src/authradius.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2000-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2000-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    @@ -655,8 +655,11 @@ CLEANRET:
     }
     
     int radauth(struct clientparam * param){
    +	int res;
     	/*radsend(param, 0, 0);*/
    -	return radsend(param, 1, 0);
    +	res = radsend(param, 1, 0);
    +	if(!res && param->srv->logfunc == logradius)radsend(param, 0, 0);
    +	return res;
     }
     
     void logradius(struct clientparam * param, const unsigned char *s) {
    diff --git a/src/base64.c b/src/base64.c
    index e6d0295..242b214 100644
    --- a/src/base64.c
    +++ b/src/base64.c
    @@ -1,5 +1,5 @@
     /*
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/common.c b/src/common.c
    index 001a4a7..53e6847 100644
    --- a/src/common.c
    +++ b/src/common.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/conf.c b/src/conf.c
    index fcdecdc..8436b96 100644
    --- a/src/conf.c
    +++ b/src/conf.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/datatypes.c b/src/datatypes.c
    index fb304ed..0d991c6 100644
    --- a/src/datatypes.c
    +++ b/src/datatypes.c
    @@ -1,5 +1,5 @@
     /*
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/dnspr.c b/src/dnspr.c
    index bdf2e61..3ec4f5f 100644
    --- a/src/dnspr.c
    +++ b/src/dnspr.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/ftp.c b/src/ftp.c
    index 6f6931c..adc35bb 100644
    --- a/src/ftp.c
    +++ b/src/ftp.c
    @@ -1,5 +1,5 @@
     /*
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/ftppr.c b/src/ftppr.c
    index 71eb8cc..d3bf9f1 100644
    --- a/src/ftppr.c
    +++ b/src/ftppr.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/log.c b/src/log.c
    index ca9daea..abeea86 100644
    --- a/src/log.c
    +++ b/src/log.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2020 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/mycrypt.c b/src/mycrypt.c
    index c07725f..4629042 100644
    --- a/src/mycrypt.c
    +++ b/src/mycrypt.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/ntlm.c b/src/ntlm.c
    index 21bd0da..8f966d3 100644
    --- a/src/ntlm.c
    +++ b/src/ntlm.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/plugins.c b/src/plugins.c
    index a0681df..509b58b 100644
    --- a/src/plugins.c
    +++ b/src/plugins.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/plugins/FilePlugin/FilePlugin.c b/src/plugins/FilePlugin/FilePlugin.c
    index 6833c2c..0b8255e 100644
    --- a/src/plugins/FilePlugin/FilePlugin.c
    +++ b/src/plugins/FilePlugin/FilePlugin.c
    @@ -1,6 +1,5 @@
     /*
    -   3APA3A simpliest proxy server
    -   (c) 2007-2008 by ZARAZA <3APA3A@security.nnov.ru>
    +   (c) 2007-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/plugins/PCREPlugin/pcre_plugin.c b/src/plugins/PCREPlugin/pcre_plugin.c
    index a444035..fbf65b4 100644
    --- a/src/plugins/PCREPlugin/pcre_plugin.c
    +++ b/src/plugins/PCREPlugin/pcre_plugin.c
    @@ -1,6 +1,5 @@
     /*
    -   3APA3A simpliest proxy server
    -   (c) 2007-2008 by ZARAZA <3APA3A@security.nnov.ru>
    +   (c) 2007-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/plugins/SSLPlugin/my_ssl.c b/src/plugins/SSLPlugin/my_ssl.c
    index 3c87380..9ad421a 100644
    --- a/src/plugins/SSLPlugin/my_ssl.c
    +++ b/src/plugins/SSLPlugin/my_ssl.c
    @@ -1,3 +1,9 @@
    +/*
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
    +
    +   please read License Agreement
    +
    +*/
     
     #define _CRT_SECURE_NO_WARNINGS
     
    @@ -14,9 +20,6 @@
     #include 
     #include 
     #include 
    -#ifdef WIN32
    -#include 
    -#endif
     
     #include "../../proxy.h"
     #include "my_ssl.h"
    @@ -104,7 +107,7 @@ void del_ext(X509 *dst_cert, int nid, int where){
     SSL_CERT ssl_copy_cert(SSL_CERT cert)
     {
     	int err = -1;
    -	FILE *fcache;
    +	BIO *fcache;
     	X509 *src_cert = (X509 *) cert;
     	X509 *dst_cert = NULL;
     
    @@ -129,16 +132,16 @@ SSL_CERT ssl_copy_cert(SSL_CERT cert)
     	bin2hex(hash_sha1, 20, hash_name_sha1, sizeof(hash_name_sha1));
     	sprintf(cache_name, "%s%s.pem", cert_path, hash_name_sha1);
     	/* check if certificate is already cached */
    -	fcache = fopen(cache_name, "rb");
    +	fcache = BIO_new_file(cache_name, "rb");
     	if ( fcache != NULL ) {
     #ifndef _WIN32
    -		flock(fileno(fcache), LOCK_SH);
    +		flock(BIO_get_fd(fcache, NULL), LOCK_SH);
     #endif
    -		dst_cert = PEM_read_X509(fcache, &dst_cert, NULL, NULL);
    +		dst_cert = PEM_read_bio_X509(fcache, &dst_cert, NULL, NULL);
     #ifndef _WIN32
    -		flock(fileno(fcache), LOCK_UN);
    +		flock(BIO_get_fd(fcache, NULL), LOCK_UN);
     #endif
    -		fclose(fcache);
    +		BIO_free(fcache);
     		if ( dst_cert != NULL ){
     			return dst_cert;
     		}
    @@ -174,16 +177,16 @@ SSL_CERT ssl_copy_cert(SSL_CERT cert)
     
     	/* write to cache */
     
    -	fcache = fopen(cache_name, "wb");
    +	fcache = BIO_new_file(cache_name, "wb");
     	if ( fcache != NULL ) {
     #ifndef _WIN32
    -		flock(fileno(fcache), LOCK_EX);
    +		flock(BIO_get_fd(fcache, NULL), LOCK_EX);
     #endif
    -		PEM_write_X509(fcache, dst_cert);
    +		PEM_write_bio_X509(fcache, dst_cert);
     #ifndef _WIN32
    -		flock(fileno(fcache), LOCK_UN);
    +		flock(BIO_get_fd(fcache, NULL), LOCK_UN);
     #endif
    -		fclose(fcache);
    +		BIO_free(fcache);
     	}
     	return dst_cert;
     }
    @@ -414,50 +417,64 @@ int ssl_file_init = 0;
     
     void ssl_init(void)
     {
    -	FILE *f;
    +	BIO *f;
     	static char fname[200];
     
     	if(!ssl_file_init++)pthread_mutex_init(&ssl_file_mutex, NULL);
     
     	pthread_mutex_lock(&ssl_file_mutex);
     	thread_setup();
    -
     	SSLeay_add_ssl_algorithms();
     	SSL_load_error_strings();
     
     	sprintf(fname, "%.128s3proxy.pem", cert_path);
    -	f = fopen(fname, "r");
    +	f = BIO_new_file(fname, "r");
     	if ( f != NULL ) {
    -		PEM_read_X509(f, &CA_cert, NULL, NULL);
    -		fclose(f);
    +		if(!(CA_cert=PEM_read_bio_X509(f, NULL, NULL, NULL))){
    +			unsigned long err;
    +			err=ERR_get_error();
    +			fprintf(stderr, "failed to read: %s: [%lu] %s\n", fname, err, ERR_error_string(err, NULL));
    +			return;
    +		}
    +		BIO_free(f);
     	}
     	else {
     		fprintf(stderr, "failed to open: %s\n", fname);
    +		return;
     	}
     	name = X509_get_subject_name(CA_cert);
    -
     	sprintf(fname, "%.128s3proxy.key", cert_path);
    -	f = fopen(fname, "rb");
    +	f = BIO_new_file(fname, "rb");
     	if ( f != NULL ) {                                             
    -		CA_key = PEM_read_PrivateKey(f, &CA_key, NULL, NULL);
    -		fclose(f);
    +		CA_key = PEM_read_bio_PrivateKey(f, NULL, NULL, NULL);
    +		if(!CA_key){
    +			unsigned long err;
    +			err=ERR_get_error();
    +			fprintf(stderr, "failed to read: %s: [%lu] %s\n", fname, err, ERR_error_string(err, NULL));
    +			return;
    +		}		
    +		BIO_free(f);
     	}
     	else {
     		fprintf(stderr, "failed to open: %s\n", fname);
    +		return;
     	}
     
     	sprintf(fname, "%.128sserver.key", cert_path);
    -	f = fopen(fname, "rb");
    +	f = BIO_new_file(fname, "rb");
     	if ( f != NULL ) {
    -		server_key = PEM_read_PrivateKey(f, &server_key, NULL, NULL);
    -		fclose(f);
    +		server_key = PEM_read_bio_PrivateKey(f, &server_key, NULL, NULL);
    +		if(!server_key){
    +			unsigned long err;
    +			err=ERR_get_error();
    +			fprintf(stderr, "failed to read: %s: [%lu] %s\n", fname, err, ERR_error_string(err, NULL));
    +			return;
    +		}		
    +		BIO_free(f);
     	}
     	else {
     		fprintf(stderr, "failed to open: %s\n", fname);
     	}
    -	if(!CA_cert || !CA_key || !server_key){
    -		fprintf(stderr, "failed to init SSL certificate / keys\n");
    -	}
     
     	bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
     	pthread_mutex_unlock(&ssl_file_mutex);
    diff --git a/src/plugins/SSLPlugin/ssl_plugin.c b/src/plugins/SSLPlugin/ssl_plugin.c
    index 6d7d729..1365821 100644
    --- a/src/plugins/SSLPlugin/ssl_plugin.c
    +++ b/src/plugins/SSLPlugin/ssl_plugin.c
    @@ -1,6 +1,5 @@
     /*
    -   3APA3A simpliest proxy server
    -   (c) 2007-2008 by ZARAZA <3APA3A@security.nnov.ru>
    +   (c) 2007-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/plugins/TransparentPlugin/transparent_plugin.c b/src/plugins/TransparentPlugin/transparent_plugin.c
    index 0619bac..5ac9cc0 100644
    --- a/src/plugins/TransparentPlugin/transparent_plugin.c
    +++ b/src/plugins/TransparentPlugin/transparent_plugin.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2017 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/plugins/WindowsAuthentication/WindowsAuthentication.c b/src/plugins/WindowsAuthentication/WindowsAuthentication.c
    index 818237e..e8d26bc 100644
    --- a/src/plugins/WindowsAuthentication/WindowsAuthentication.c
    +++ b/src/plugins/WindowsAuthentication/WindowsAuthentication.c
    @@ -1,6 +1,5 @@
     /*
    -   3APA3A simpliest proxy server
    -   (c) 2007-2008 by ZARAZA <3APA3A@security.nnov.ru>
    +   (c) 2007-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/plugins/WindowsAuthentication/copying b/src/plugins/WindowsAuthentication/copying
    deleted file mode 100644
    index 177ffa7..0000000
    --- a/src/plugins/WindowsAuthentication/copying
    +++ /dev/null
    @@ -1,31 +0,0 @@
    -3proxy 0.6 Windows Authentication Plugin Public License Agreement
    -
    -This software provided "as is" without any guaranties or support.
    -
    -This software is FREEWARE. You can use it under terms of current version
    -of GNU GPL (General Public License) available from 
    -http://www.gnu.org/licenses/gpl.txt or under conditions below:
    -
    -1. You are granted non-exclusive rights to compile, modify, use and
    -re-distribute this program.
    -2. In case this software is redistributed in binary form, source code
    -MUST be available for user for free.
    -3. In case this software redistributed embedded in hardware device or
    -pre-installed version of operation system and source code is not available,
    -documentation MUST refer to http://www.security.nnov.ru/ as a source of
    -software.
    -4. In case this software is modified or is used as a part of another project
    -license MUST NOT be modified.
    -5. Authors of this software MAY change terms of this license for future
    -versions of this product.
    -
    -(c) 2000-2009 by 3APA3A (3APA3A@security.nnov.ru)
    -(c) 2000-2009 by SECURITY.NNOV (http://www.security.nnov.ru)
    -(c) 2000-2009 by Vladimir Dubrovin (vlad@sandy.ru)
    -
    -
    -This software uses:
    -  RSA Data Security, Inc. MD4 Message-Digest Algorithm
    -  RSA Data Security, Inc. MD5 Message-Digest Algorithm
    -
    -$Id: copying,v 1.1 2006/02/13 16:08:03 vlad Exp $
    diff --git a/src/plugins/utf8tocp1251/utf8tocp1251.c b/src/plugins/utf8tocp1251/utf8tocp1251.c
    index 412c927..cb8d632 100644
    --- a/src/plugins/utf8tocp1251/utf8tocp1251.c
    +++ b/src/plugins/utf8tocp1251/utf8tocp1251.c
    @@ -1,6 +1,5 @@
     /*
    -   3APA3A simpliest proxy server
    -   (c) 2007-2008 by ZARAZA <3APA3A@security.nnov.ru>
    +   (c) 2007-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/pop3p.c b/src/pop3p.c
    index b433998..912a9c5 100644
    --- a/src/pop3p.c
    +++ b/src/pop3p.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/proxy.c b/src/proxy.c
    index fa41e67..52220ca 100644
    --- a/src/proxy.c
    +++ b/src/proxy.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/proxy.h b/src/proxy.h
    index 9ff920e..b30ebe8 100644
    --- a/src/proxy.h
    +++ b/src/proxy.h
    @@ -1,13 +1,13 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
     */
     
    -#define COPYRIGHT "(c)3APA3A, Vladimir Dubrovin & 3proxy.ru\n"\
    -		 "Documentation and sources: http://3proxy.ru/\n"\
    +#define COPYRIGHT "(c)3APA3A, Vladimir Dubrovin & 3proxy.org\n"\
    +		 "Documentation and sources: https://3proxy.org/\n"\
     		 "Please read license agreement in \'copying\' file.\n"\
     		 "You may not use this program without accepting license agreement"
     
    diff --git a/src/proxymain.c b/src/proxymain.c
    index 53856db..065d088 100644
    --- a/src/proxymain.c
    +++ b/src/proxymain.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2017 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/smtpp.c b/src/smtpp.c
    index 01519ca..e7748b2 100644
    --- a/src/smtpp.c
    +++ b/src/smtpp.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/sockgetchar.c b/src/sockgetchar.c
    index da2105c..89e3e5b 100644
    --- a/src/sockgetchar.c
    +++ b/src/sockgetchar.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     */
    diff --git a/src/sockmap.c b/src/sockmap.c
    index 77234ea..19b603f 100644
    --- a/src/sockmap.c
    +++ b/src/sockmap.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2020 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/socks.c b/src/socks.c
    index 404dbcd..ee3d5aa 100644
    --- a/src/socks.c
    +++ b/src/socks.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    diff --git a/src/stringtable.c b/src/stringtable.c
    index 4bfc7c2..e9330c1 100644
    --- a/src/stringtable.c
    +++ b/src/stringtable.c
    @@ -1,6 +1,6 @@
     /*
        3APA3A simpliest proxy server
    -   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
    +   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
     
        please read License Agreement
     
    @@ -61,9 +61,9 @@ unsigned char * strings[] = {
     	"is coded right now. What you see is a part of work that is done\n"
     	"already.\n"
     	"

    Please send all your comments to\n" - "3proxy@security.nnov.ru\n" + "3proxy@3proxy.org\n" "

    Documentation:\n" - "http://3proxy.ru/\n" + "http://3proxy.org/\n" "", /* 36 */ NULL, /* 37 */ NULL, diff --git a/src/structures.h b/src/structures.h index 61a4f31..6d929ca 100644 --- a/src/structures.h +++ b/src/structures.h @@ -1,6 +1,6 @@ /* 3APA3A simpliest proxy server - (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru> + (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org> please read License Agreement diff --git a/src/tcppm.c b/src/tcppm.c index a53cd65..92cc094 100644 --- a/src/tcppm.c +++ b/src/tcppm.c @@ -1,6 +1,6 @@ /* 3APA3A simpliest proxy server - (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru> + (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org> please read License Agreement diff --git a/src/udppm.c b/src/udppm.c index 4b252ef..f732ba2 100644 --- a/src/udppm.c +++ b/src/udppm.c @@ -1,6 +1,6 @@ /* 3APA3A simpliest proxy server - (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru> + (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org> please read License Agreement diff --git a/src/version.h b/src/version.h index 8e3996c..0c709e7 100644 --- a/src/version.h +++ b/src/version.h @@ -1,12 +1,12 @@ #ifndef VERSION -#define VERSION "3proxy-0.9.3" +#define VERSION "3proxy-0.9.4" #endif #ifndef BUILDDATE #define BUILDDATE "" #endif #define MAJOR3PROXY 0 #define SUBMAJOR3PROXY 9 -#define MINOR3PROXY 3 +#define MINOR3PROXY 4 #define SUBMINOR3PROXY 0 -#define RELEASE3PROXY "3proxy-0.9.3(" BUILDDATE ")\0" +#define RELEASE3PROXY "3proxy-0.9.4(" BUILDDATE ")\0" #define YEAR3PROXY "2021" diff --git a/src/webadmin.c b/src/webadmin.c index 936ef2a..0aefc38 100644 --- a/src/webadmin.c +++ b/src/webadmin.c @@ -1,6 +1,6 @@ /* 3APA3A simpliest proxy server - (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru> + (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org> please read License Agreement