diff --git a/.gitignore b/.gitignore index bfc42e5..9820cae 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,8 @@ tmp/ version.c doc/html/man3/ doc/html/man8/ +doc/html/index.html +*.var verfile.sh Makefile copytgz.sh diff --git a/doc/html/index.html b/doc/html/index.html deleted file mode 100644 index d7786a9..0000000 --- a/doc/html/index.html +++ /dev/null @@ -1,18 +0,0 @@ -3proxy documentation

3proxy documentation

-Security recommendations
-How To (English, very incomplete)
-How To (Russian, Windows1251)
-FAQ (English)
-FAQ (Russian, Windows1251) -

Man pages: -
3proxy.8 -
ftppr.8 -
icqpr.8 -
pop3p.8 -
proxy.8 -
smtpp.8 -
socks.8 -
tcppm.8 -
udppm.8 -
3proxy.cfg.3 - diff --git a/src/plugins/FilePlugin/Makefile.var b/src/plugins/FilePlugin/Makefile.var deleted file mode 100644 index 6e2c41c..0000000 --- a/src/plugins/FilePlugin/Makefile.var +++ /dev/null @@ -1,37 +0,0 @@ -VERFILE = version.obj ../3proxy.RES -#$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) -# -# You can try to remove -DWITH_STD_MALLOC to CFLAGS to use optimized malloc -# libraries -# -# Add /DSAFESQL to CFLAGS if you are using poorely written/tested ODBC driver - -BUILDDIR = ../bin/ -CC = cl -CFLAGS = /nologo /MT /W3 /Ox /GS /EHs- /GA /GF /D "MSVC" /D "WITH_STD_MALLOC" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /Fp"proxy.pch" /FD /c -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 libeay32MT.lib ssleay32MT.lib -LIBEXT = .lib -LNOUT = /out: -EXESUFFICS = .exe -OBJSUFFICS = .obj -DEFINEOPTION = /D -COMPFILES = *.pch *.idb -REMOVECOMMAND = del 2>NUL >NUL -TYPECOMMAND = type -COMPATLIBS = -MAKEFILE = Makefile.msvc -PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin lastFripper FilePlugin - - -include Makefile.inc - -allplugins: - for /D %%i in ($(PLUGINS)) do (copy Makefile plugins\%%i && copy Makefile.var plugins\%%i && cd plugins\%%i && nmake && del *.obj *.idb &&cd ..\..) - \ No newline at end of file diff --git a/src/plugins/LastFRipper/Makefile.var b/src/plugins/LastFRipper/Makefile.var deleted file mode 100644 index 6e2c41c..0000000 --- a/src/plugins/LastFRipper/Makefile.var +++ /dev/null @@ -1,37 +0,0 @@ -VERFILE = version.obj ../3proxy.RES -#$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) -# -# You can try to remove -DWITH_STD_MALLOC to CFLAGS to use optimized malloc -# libraries -# -# Add /DSAFESQL to CFLAGS if you are using poorely written/tested ODBC driver - -BUILDDIR = ../bin/ -CC = cl -CFLAGS = /nologo /MT /W3 /Ox /GS /EHs- /GA /GF /D "MSVC" /D "WITH_STD_MALLOC" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /Fp"proxy.pch" /FD /c -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 libeay32MT.lib ssleay32MT.lib -LIBEXT = .lib -LNOUT = /out: -EXESUFFICS = .exe -OBJSUFFICS = .obj -DEFINEOPTION = /D -COMPFILES = *.pch *.idb -REMOVECOMMAND = del 2>NUL >NUL -TYPECOMMAND = type -COMPATLIBS = -MAKEFILE = Makefile.msvc -PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin lastFripper FilePlugin - - -include Makefile.inc - -allplugins: - for /D %%i in ($(PLUGINS)) do (copy Makefile plugins\%%i && copy Makefile.var plugins\%%i && cd plugins\%%i && nmake && del *.obj *.idb &&cd ..\..) - \ No newline at end of file diff --git a/src/plugins/PCREPlugin/Makefile.var b/src/plugins/PCREPlugin/Makefile.var deleted file mode 100644 index 6e2c41c..0000000 --- a/src/plugins/PCREPlugin/Makefile.var +++ /dev/null @@ -1,37 +0,0 @@ -VERFILE = version.obj ../3proxy.RES -#$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) -# -# You can try to remove -DWITH_STD_MALLOC to CFLAGS to use optimized malloc -# libraries -# -# Add /DSAFESQL to CFLAGS if you are using poorely written/tested ODBC driver - -BUILDDIR = ../bin/ -CC = cl -CFLAGS = /nologo /MT /W3 /Ox /GS /EHs- /GA /GF /D "MSVC" /D "WITH_STD_MALLOC" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /Fp"proxy.pch" /FD /c -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 libeay32MT.lib ssleay32MT.lib -LIBEXT = .lib -LNOUT = /out: -EXESUFFICS = .exe -OBJSUFFICS = .obj -DEFINEOPTION = /D -COMPFILES = *.pch *.idb -REMOVECOMMAND = del 2>NUL >NUL -TYPECOMMAND = type -COMPATLIBS = -MAKEFILE = Makefile.msvc -PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin lastFripper FilePlugin - - -include Makefile.inc - -allplugins: - for /D %%i in ($(PLUGINS)) do (copy Makefile plugins\%%i && copy Makefile.var plugins\%%i && cd plugins\%%i && nmake && del *.obj *.idb &&cd ..\..) - \ No newline at end of file diff --git a/src/plugins/SSLPlugin/Makefile.var b/src/plugins/SSLPlugin/Makefile.var deleted file mode 100644 index cc48314..0000000 --- a/src/plugins/SSLPlugin/Makefile.var +++ /dev/null @@ -1,37 +0,0 @@ -VERFILE = version.obj ../3proxy.RES -#$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) -# -# You can try to remove -DWITH_STD_MALLOC to CFLAGS to use optimized malloc -# libraries -# -# Add /DSAFESQL to CFLAGS if you are using poorely written/tested ODBC driver - -BUILDDIR = ../bin/ -CC = cl -CFLAGS = /nologo /MT /W3 /Ox /GS /EHs- /GA /GF /D "MSVC" /D "WITH_STD_MALLOC" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /Fp"proxy.pch" /FD /c -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 libeay32MT.lib ssleay32MT.lib -LIBEXT = .lib -LNOUT = /out: -EXESUFFICS = .exe -OBJSUFFICS = .obj -DEFINEOPTION = /D -COMPFILES = *.pch *.idb -REMOVECOMMAND = del 2>NUL >NUL -TYPECOMMAND = type -COMPATLIBS = -MAKEFILE = Makefile.msvc -PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin lastFripper FilePlugin SSLPlugin - - -include Makefile.inc - -allplugins: - for /D %%i in ($(PLUGINS)) do (copy Makefile plugins\%%i && copy Makefile.var plugins\%%i && cd plugins\%%i && nmake && del *.obj *.idb &&cd ..\..) - \ No newline at end of file diff --git a/src/plugins/StringsPlugin/Makefile.var b/src/plugins/StringsPlugin/Makefile.var deleted file mode 100644 index 6e2c41c..0000000 --- a/src/plugins/StringsPlugin/Makefile.var +++ /dev/null @@ -1,37 +0,0 @@ -VERFILE = version.obj ../3proxy.RES -#$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) -# -# You can try to remove -DWITH_STD_MALLOC to CFLAGS to use optimized malloc -# libraries -# -# Add /DSAFESQL to CFLAGS if you are using poorely written/tested ODBC driver - -BUILDDIR = ../bin/ -CC = cl -CFLAGS = /nologo /MT /W3 /Ox /GS /EHs- /GA /GF /D "MSVC" /D "WITH_STD_MALLOC" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /Fp"proxy.pch" /FD /c -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 libeay32MT.lib ssleay32MT.lib -LIBEXT = .lib -LNOUT = /out: -EXESUFFICS = .exe -OBJSUFFICS = .obj -DEFINEOPTION = /D -COMPFILES = *.pch *.idb -REMOVECOMMAND = del 2>NUL >NUL -TYPECOMMAND = type -COMPATLIBS = -MAKEFILE = Makefile.msvc -PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin lastFripper FilePlugin - - -include Makefile.inc - -allplugins: - for /D %%i in ($(PLUGINS)) do (copy Makefile plugins\%%i && copy Makefile.var plugins\%%i && cd plugins\%%i && nmake && del *.obj *.idb &&cd ..\..) - \ No newline at end of file diff --git a/src/plugins/TrafficPlugin/Makefile.var b/src/plugins/TrafficPlugin/Makefile.var deleted file mode 100644 index 6e2c41c..0000000 --- a/src/plugins/TrafficPlugin/Makefile.var +++ /dev/null @@ -1,37 +0,0 @@ -VERFILE = version.obj ../3proxy.RES -#$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) -# -# You can try to remove -DWITH_STD_MALLOC to CFLAGS to use optimized malloc -# libraries -# -# Add /DSAFESQL to CFLAGS if you are using poorely written/tested ODBC driver - -BUILDDIR = ../bin/ -CC = cl -CFLAGS = /nologo /MT /W3 /Ox /GS /EHs- /GA /GF /D "MSVC" /D "WITH_STD_MALLOC" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /Fp"proxy.pch" /FD /c -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 libeay32MT.lib ssleay32MT.lib -LIBEXT = .lib -LNOUT = /out: -EXESUFFICS = .exe -OBJSUFFICS = .obj -DEFINEOPTION = /D -COMPFILES = *.pch *.idb -REMOVECOMMAND = del 2>NUL >NUL -TYPECOMMAND = type -COMPATLIBS = -MAKEFILE = Makefile.msvc -PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin lastFripper FilePlugin - - -include Makefile.inc - -allplugins: - for /D %%i in ($(PLUGINS)) do (copy Makefile plugins\%%i && copy Makefile.var plugins\%%i && cd plugins\%%i && nmake && del *.obj *.idb &&cd ..\..) - \ No newline at end of file diff --git a/src/plugins/TransparentPlugin/Makefile.var b/src/plugins/TransparentPlugin/Makefile.var deleted file mode 100644 index ae5de95..0000000 --- a/src/plugins/TransparentPlugin/Makefile.var +++ /dev/null @@ -1,35 +0,0 @@ -#$Id: Makefile.win,v 1.9 2007/08/20 15:26:27 vlad Exp $ -# -# 3 proxy Makefile for GCC/windows -# -# You can try to remove -DWITH_STD_MALLOC to CFLAGS to use optimized malloc -# libraries -# -# remove -DNOODBC from CFLAGS and add -lodbc to LDFLAGS to compile with ODBC -# library support - - -BUILDDIR = ../bin/ -CC = gcc -CFLAGS = -Wall -O2 -s -c -mno-cygwin -mthreads -DWITH_STD_MALLOC -COUT = -o -LN = gcc -LDFLAGS = -Wall -O2 -s -mno-cygwin -mthreads -DLFLAGS = -shared -DLSUFFICS = .dll -LIBS = -lws2_32 -lodbc32 -ladvapi32 -LNOUT = -o -EXESUFFICS = .exe -OBJSUFFICS = .o -DEFINEOPTION = -D -COMPFILES = *.tmp -REMOVECOMMAND = rm -f -TYPECOMMAND = cat -COMPATLIBS = -MAKEFILE = Makefile.win -PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin - -include Makefile.inc - -allplugins: - @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ; rm *.o ; cd ../.. ; done diff --git a/src/plugins/WindowsAuthentication/Makefile.var b/src/plugins/WindowsAuthentication/Makefile.var deleted file mode 100644 index 6e2c41c..0000000 --- a/src/plugins/WindowsAuthentication/Makefile.var +++ /dev/null @@ -1,37 +0,0 @@ -VERFILE = version.obj ../3proxy.RES -#$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) -# -# You can try to remove -DWITH_STD_MALLOC to CFLAGS to use optimized malloc -# libraries -# -# Add /DSAFESQL to CFLAGS if you are using poorely written/tested ODBC driver - -BUILDDIR = ../bin/ -CC = cl -CFLAGS = /nologo /MT /W3 /Ox /GS /EHs- /GA /GF /D "MSVC" /D "WITH_STD_MALLOC" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /Fp"proxy.pch" /FD /c -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 libeay32MT.lib ssleay32MT.lib -LIBEXT = .lib -LNOUT = /out: -EXESUFFICS = .exe -OBJSUFFICS = .obj -DEFINEOPTION = /D -COMPFILES = *.pch *.idb -REMOVECOMMAND = del 2>NUL >NUL -TYPECOMMAND = type -COMPATLIBS = -MAKEFILE = Makefile.msvc -PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin lastFripper FilePlugin - - -include Makefile.inc - -allplugins: - for /D %%i in ($(PLUGINS)) do (copy Makefile plugins\%%i && copy Makefile.var plugins\%%i && cd plugins\%%i && nmake && del *.obj *.idb &&cd ..\..) - \ No newline at end of file diff --git a/src/plugins/utf8tocp1251/Makefile.var b/src/plugins/utf8tocp1251/Makefile.var deleted file mode 100644 index 6e2c41c..0000000 --- a/src/plugins/utf8tocp1251/Makefile.var +++ /dev/null @@ -1,37 +0,0 @@ -VERFILE = version.obj ../3proxy.RES -#$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) -# -# You can try to remove -DWITH_STD_MALLOC to CFLAGS to use optimized malloc -# libraries -# -# Add /DSAFESQL to CFLAGS if you are using poorely written/tested ODBC driver - -BUILDDIR = ../bin/ -CC = cl -CFLAGS = /nologo /MT /W3 /Ox /GS /EHs- /GA /GF /D "MSVC" /D "WITH_STD_MALLOC" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /Fp"proxy.pch" /FD /c -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 libeay32MT.lib ssleay32MT.lib -LIBEXT = .lib -LNOUT = /out: -EXESUFFICS = .exe -OBJSUFFICS = .obj -DEFINEOPTION = /D -COMPFILES = *.pch *.idb -REMOVECOMMAND = del 2>NUL >NUL -TYPECOMMAND = type -COMPATLIBS = -MAKEFILE = Makefile.msvc -PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin lastFripper FilePlugin - - -include Makefile.inc - -allplugins: - for /D %%i in ($(PLUGINS)) do (copy Makefile plugins\%%i && copy Makefile.var plugins\%%i && cd plugins\%%i && nmake && del *.obj *.idb &&cd ..\..) - \ No newline at end of file diff --git a/src/version.h b/src/version.h index 2b3bcf4..12f8c91 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ -#define VERSION "3proxy-0.7" -#define BUILDDATE "140408012613" +#define VERSION "3proxy-0.8b-devel" +#define BUILDDATE "140409014428"