Copy to master from devel - ready for 0.8

.gitignore

@@ -25,6 +25,7 @@ doc/html/index.html
 verfile.sh
 Makefile
 Changelog
+res
 copytgz.sh
 *~.nib
 local.properties

3proxy.rc

@@ -3,8 +3,8 @@
 LANGUAGE 0x09, 0x01
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,7,0,0
- PRODUCTVERSION 0,7,0,0
+ FILEVERSION 0,8,0,0
+ PRODUCTVERSION 0,8,0,0
  FILETYPE 0x1L
  FILESUBTYPE 0x0L
 BEGIN

Makefile.Linux

@@ -1,4 +1,3 @@
-#$Id: Makefile.Linux,v 1.24 2014-04-07 20:34:57 vlad Exp $
 #
 # 3 proxy Makefile for GCC/Linux/Cygwin
 #
@@ -11,17 +10,15 @@
 BUILDDIR =
 CC = gcc
 
-CFLAGS = -Wall -g -O2 -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
+CFLAGS = -g -O2 -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
 COUT = -o 
 LN = gcc
 DCFLAGS = -fpic
-LDFLAGS = -Wall -O2 -pthread
+LDFLAGS = -O2 -pthread
 DLFLAGS = -shared
 DLSUFFICS = .ld.so
 # -lpthreads may be reuqired on some platforms instead of -pthreads
-#LIBS = -lcrypto -lssl -ldl 
-# libcrypto and libssl are required for SSLPlugin
-LIBS = -ldl 
+LIBS = -lcrypto -lssl -ldl 
 LNOUT = -o 
 EXESUFFICS =
 OBJSUFFICS = .o
@@ -31,9 +28,7 @@ REMOVECOMMAND = rm -f
 TYPECOMMAND = cat
 COMPATLIBS =
 MAKEFILE = Makefile.Linux
-#PLUGINS = SSLPlugin StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin
-# SSLPlugin is not built by default because of external dependencies
-PLUGINS = StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin
+PLUGINS = SSLPlugin StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin
 
 include Makefile.inc
 
@@ -49,7 +44,6 @@ INSTALL		= /usr/bin/install
 INSTALL_BIN	= $(INSTALL) -m 755
 INSTALL_DATA	= $(INSTALL) -m 644
 INSTALL_OBJS	= src/3proxy \
-		  src/countersutil \
 		  src/dighosts \
 		  src/ftppr \
 		  src/mycrypt \

Makefile.Solaris

@@ -1,4 +1,3 @@
-#$Id: Makefile.Solaris,v 1.18 2008/09/30 13:58:44 vlad Exp $
 #
 # 3 proxy Makefile for Solaris/SunCC
 #

Makefile.Solaris-gcc

@@ -1,4 +1,3 @@
-#$Id: Makefile.Solaris-gcc,v 1.14 2008/09/30 13:58:44 vlad Exp $
 #
 # 3 proxy Makefile for Solaris/gcc
 #

Makefile.ccc

@@ -1,4 +1,3 @@
-#$Id: Makefile.ccc,v 1.12 2007/04/10 16:29:25 vlad Exp $
 #
 # 3 proxy Makefile for Compaq C Compiler
 #
@@ -10,10 +9,10 @@
 
 BUILDDIR =
 CC = ccc
-CFLAGS = -Wall -O2 -c -pthread -D_THREAD_SAFE -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -WITH_POLL
+CFLAGS = -O2 -c -pthread -D_THREAD_SAFE -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -WITH_POLL
 COUT = -o 
 LN = ccc
-LDFLAGS = -Wall -O2 -pthread
+LDFLAGS = -O2 -pthread
 DCFLAGS = -fpic
 DLFLAGS = -shared
 DLSUFFICS = .ld.so

Makefile.debug

@@ -1,4 +1,3 @@
-#$Id: Makefile.debug,v 1.7 2007/04/18 05:33:19 vlad Exp $
 #
 # 3 proxy Makefile for Microsoft Visual C compiler (for both make and nmake)
 #

Makefile.inc

@@ -1,4 +1,3 @@
-#$Id: Makefile.inc,v 1.3 2007/01/23 16:00:26 vlad Exp $
 #
 # 3 proxy common Makefile
 #

Makefile.intl

@@ -1,4 +1,3 @@
-#$Id: Makefile.intl,v 1.8 2007/07/21 18:47:00 vlad Exp $
 #
 # 3 proxy Makefile for Intel C compiler for Windows (for both make and nmake)
 #

Makefile.msvc

@@ -1,4 +1,3 @@
-#$Id: Makefile.msvc,v 1.17 2010-11-11 14:44:11 v.dubrovin Exp $
 #
 # 3 proxy Makefile for Microsoft Visual C compiler (for both make and nmake)
 #
@@ -15,7 +14,7 @@ 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 
+LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib libeay32MT.lib ssleay32MT.lib
 LIBSOLD = libeay32MT.lib ssleay32MT.lib
 LIBEXT = .lib                                                                                               
 LNOUT = /out:
@@ -27,16 +26,16 @@ REMOVECOMMAND = del 2>NUL >NUL
 TYPECOMMAND = type
 COMPATLIBS =
 MAKEFILE = Makefile.msvc
-PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin lastFripper FilePlugin
-VERFILE = 3proxyres.obj $(VERFILE)
+PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin FilePlugin SSLPlugin
+VERFILE = $(VERFILE)
 
 include Makefile.inc
 
 ../3proxy.res:
 	rc /fo../3proxy.res ../3proxy.rc
 
 3proxyres.obj: ../3proxy.res
-	cvtres /out:3proxyres.obj /MACHINE:X86 ../3proxy.res
+	cvtres /out:3proxyres.obj /MACHINE:I386 ../3proxy.res
 
 allplugins:
 	for /D %%i in ($(PLUGINS)) do (copy Makefile plugins\%%i && copy Makefile.var plugins\%%i && cd plugins\%%i && nmake && del *.obj *.idb &&cd ..\..)

Makefile.msvc64

@@ -1,4 +1,3 @@
-#$Id: Makefile.msvc64,v 1.14 2007/07/21 18:47:05 vlad Exp $
 #
 # 3 proxy Makefile for Microsoft Visual C compiler (for both make and nmake)
 #
@@ -15,7 +14,7 @@ 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 
+LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib libeay32MT.lib ssleay32MT.lib
 LIBSOLD = libeay32MT.lib ssleay32MT.lib
 LIBEXT = .lib
 LNOUT = /out:
@@ -27,16 +26,23 @@ REMOVECOMMAND = del 2>NUL >NUL
 TYPECOMMAND = type
 COMPATLIBS =
 MAKEFILE = Makefile.msvc64
-PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin
-VERFILE = 3proxyres.obj $(VERFILE)
+PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin FilePlugin SSLPlugin
+VERFILE = $(VERFILE)
+
+#../3proxy.res:
+#	rc /fo../3proxy.res ../3proxy.rc
+
+#3proxyres.obj: ../3proxy.res
+#	cvtres /out:3proxyres.obj /MACHINE:X64 ../3proxy.res
 
 include Makefile.inc
 
 ../3proxy.res:
 	rc /fo../3proxy.res ../3proxy.rc
 
 3proxyres.obj: ../3proxy.res
-	cvtres /out:3proxyres.obj /MACHINE:X64 ../3proxy.res
+	cvtres /out:3proxyres.obj /machine:x64 ../3proxy.res
+
 
 allplugins:
 	for /D %%i in ($(PLUGINS)) do (copy Makefile plugins\%%i && copy Makefile.var plugins\%%i && cd plugins\%%i && nmake && del *.obj *.idb &&cd ..\..)

Makefile.msvcCE

@@ -1,4 +1,3 @@
-#$Id: Makefile.msvc,v 1.14 2007/07/21 18:47:02 vlad Exp $
 #
 # 3 proxy Makefile for Microsoft Visual C compiler (for both make and nmake)
 #

Makefile.unix

@@ -1,4 +1,3 @@
-#$Id: Makefile.unix,v 1.20 2007/04/10 16:29:25 vlad Exp $
 #
 # 3 proxy Makefile for GCC/Unix
 #
@@ -12,10 +11,10 @@ BUILDDIR =
 CC = gcc
 
 # you may need -L/usr/pkg/lib for older NetBSD versions
-CFLAGS = -Wall -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
+CFLAGS = -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
 COUT = -o 
 LN = gcc
-LDFLAGS = -Wall -O2 -pthread
+LDFLAGS = -O2 -pthread
 # -lpthreads may be reuqired on some platforms instead of -pthreads
 # -ldl or -lld may be required for some platforms
 DCFLAGS = -fpic

Makefile.unix-install

@@ -7,7 +7,6 @@ INSTALL		= /usr/bin/install
 INSTALL_BIN	= $(INSTALL) -m 755
 INSTALL_DATA	= $(INSTALL) -m 644
 INSTALL_OBJS	= src/3proxy \
-		  src/countersutil \
 		  src/dighosts \
 		  src/ftppr \
 		  src/mycrypt \

Makefile.win

@@ -1,4 +1,3 @@
-#$Id: Makefile.win,v 1.9 2007/08/20 15:26:27 vlad Exp $
 #
 # 3 proxy Makefile for GCC/windows
 #
@@ -11,7 +10,7 @@
 
 BUILDDIR = ../bin/
 CC = gcc
-CFLAGS = -O2 -s -c -mthreads -DWITH_STD_MALLOC
+CFLAGS = -O2 -s -c -mthreads -DWITH_STD_MALLOC -DNOIPV6
 COUT = -o 
 LN = gcc
 LDFLAGS = -O2 -s  -mthreads

Makefile.winCE

@@ -1,4 +1,3 @@
-#$Id: Makefile.win,v 1.9 2007/08/20 15:26:27 vlad Exp $
 #
 # 3 proxy Makefile for GCC/windows
 #
@@ -11,10 +10,10 @@
 
 BUILDDIR = ../bin/
 CC = /opt/cegcc/arm-wince-cegcc/bin/gcc
-CFLAGS = -Wall -O2 -s -c -mthreads -DWITH_STD_MALLOC -DNOODBC -D_WINCE -D_WIN32 -D__USE_W32_SOCKETS
+CFLAGS = -O2 -s -c -mthreads -DWITH_STD_MALLOC -DNOODBC -D_WINCE -D_WIN32 -D__USE_W32_SOCKETS
 COUT = -o 
 LN = /opt/cegcc/arm-wince-cegcc/bin/gcc
-LDFLAGS = -Wall -O2 -s -mthreads
+LDFLAGS = -O2 -s -mthreads
 DLFLAGS = -shared
 DLSUFFICS = .dll
 LIBS = -lws2

README

@@ -1,6 +1,6 @@
 /*
    3APA3A 3proxy tiny proxy server
-   (c) 2002-2014 by Vladimir '3APA3A' Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2016 by Vladimir '3APA3A' Dubrovin <3proxy@3proxy.ru>
 
    please read License Agreement
 */
@@ -39,7 +39,6 @@ smtpp    	SMTP proxy server, binds to port 25. You must specify
 icqpr    	ICQ/AIM proxy. Maps some TCP port to TCP port of ICQ
 		server and performs packets translation. Example:
 		icqpr 5190 login.icq.com 5190
-msnpr		MSN proxy (beta)
 tcppm    	TCP port mapping. Maps some TCP port on local machine to
 		TCP port on remote host.
 udppm    	UDP port mapping. Maps some UDP port on local machine to
@@ -56,9 +55,10 @@ mycrypt    	Program to obtain crypted password fro cleartext. Supports
 			mycrypt salt password
 		produces MD5/crypt password with salt "salt".
 dighosts    	Utility for building networks list from web page.
-countersutil	Utility to manage counters file
 
 
 Run utility with --help option for command line reference.
 
 Latest version is available from http://3proxy.ru/
+
+Want to donate the project? http://3proxy.ru/donations/

Release.notes

@@ -104,4 +104,3 @@
    - Addon antiviral, HTTP cache filters modules, authentication
      modules for different protocols (RADIUS, PAM etc).
 
-$Id: Release.notes,v 1.9 2014-04-07 21:24:42 vlad Exp $

cfg/0.scenario.txt

@@ -15,4 +15,3 @@ on the provider's Web server.
 Provider has proxy server 10.1.2.5. Traffic from proxy server is not free, but
 is cheaper than traffic from non-free networks.
 
-$Id: 0.scenario.txt,v 1.2 2004/07/23 13:33:39 vlad Exp $

cfg/3proxy.cfg.sample

@@ -199,4 +199,3 @@ admin
 # now we needn't any root rights. We can chroot and setgid/setuid.
 
 
-###$Id: 3proxy.cfg.sample,v 1.7 2006/11/18 14:37:06 vlad Exp $#######

cfg/counters.sample

@@ -50,4 +50,3 @@ internal 127.0.0.1
 allow user1
 admin
 
-#$Id: counters.sample,v 1.2 2004/07/23 13:33:39 vlad Exp $

copying

@@ -59,4 +59,3 @@ terms of compatible license, including:
 	http://www.gnu.org/licenses/lgpl.txt
 
 
-$Id: License,v 1.3 2007/04/05 11:59:47 vlad Exp $

doc/html/faqe.html

@@ -153,6 +153,3 @@ <h3>Why so ...?</h3>
 
 <p><i>Q: Why do you use insecure strcpy, sprintf, etc?</i></p>
 A: Why not? I try to use insecure function in secure manner. You're welcome to look for vulnerabilities.
-<pre>
-$Id: faqe.html,v 1.10 2007/07/31 08:42:38 vlad Exp $
-</pre>

doc/html/faqr.html

@@ -278,6 +278,3 @@
   пугать.
   </p>
 </ul>
-<pre>
-$Id: faqr.html,v 1.28 2007/09/25 09:47:13 vlad Exp $
-</pre>

doc/html/howtoe.html

@@ -832,4 +832,3 @@
 
 </ul>
 
-<pre>$Id: howtoe.html,v 1.41 2009/02/02 10:04:49 vlad Exp $</pre>

doc/html/howtor.html

@@ -1026,6 +1026,3 @@
 Только не пытайтесь задавать какие-либо вопросы, если вы просто не поняли этот
 HowTo.
 </ul> 
-<pre>
-$Id: howtor.html,v 1.40 2010/01/21 13:34:20 v.dubrovin Exp $
-</pre>

doc/html/securityen.html

@@ -1,10 +1,10 @@
 <h3>3proxy security considirations</h3>
 </ul>
-<ol>
+<ul>
 <li>Never install 3proxy suid. If you need it to run suid write some
 wrapper with fixed configuration file.
 <li>Make configuration file only available to account 3proxy starts with.
-<li>Under Windows NT/2000/XP/2003 if 3proxy is used as service create new
+<li>Under Windows if 3proxy is used as service create new
 unprivileged local account without "logon locally" right. Assign this account
 to 3proxy service.
 <li>Under unix use chroot to jail 3proxy (make sure files included in
@@ -20,9 +20,8 @@ <h3>3proxy security considirations</h3>
 <li>Always limit connections to internal network and localhost (to 127.0.0.1 and
 all interfaces) with ACLs. Be carefull, because BIND command in SOCKS requies
 BIND method with external interface IP address to be allowed.
-<li> Always use nserver and nscache under Unix, overwise DoS attack is possible
+<li> Before 3proxy 0.8 always use nserver and nscache under Unix, overwise DoS attack is possible
 with unreachable DNS server (because gethostbyname will block over threads).
-<li>Remember, that 'nbname' authentication is not reliable and can be spoofed.
 <li>Keep logs in secure location, because some confidential information from
 user's request can be logged.
 <li>Use -xyz+A character filtering sequences for 'logformat', especially with
@@ -31,7 +30,6 @@ <h3>3proxy security considirations</h3>
 <li>Participate in code audit :)
 </ol>
 
-</ol>
+</ul>
 <p>
 
-<pre>$Id: securityen.html,v 1.4 2007/05/07 09:16:51 vlad Exp $</pre>