Strona główna Odkrywaj Pomoc
Zaloguj się
cturan
/
3proxy
1
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

more files removed

Vladimir Dubrovin 11 lat temu
rodzic
a3ffc7dc3b
commit
094a4440e6
12 zmienionych plików z 4 dodań i 351 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 2 0
      .gitignore
  2. 0 18
      doc/html/index.html
  3. 0 37
      src/plugins/FilePlugin/Makefile.var
  4. 0 37
      src/plugins/LastFRipper/Makefile.var
  5. 0 37
      src/plugins/PCREPlugin/Makefile.var
  6. 0 37
      src/plugins/SSLPlugin/Makefile.var
  7. 0 37
      src/plugins/StringsPlugin/Makefile.var
  8. 0 37
      src/plugins/TrafficPlugin/Makefile.var
  9. 0 35
      src/plugins/TransparentPlugin/Makefile.var
  10. 0 37
      src/plugins/WindowsAuthentication/Makefile.var
  11. 0 37
      src/plugins/utf8tocp1251/Makefile.var
  12. 2 2
      src/version.h

+ 2 - 0
.gitignore
Wyświetl plik 

@@ -16,6 +16,8 @@ tmp/
 
 version.c
 
 doc/html/man3/
 
 doc/html/man8/
 
+doc/html/index.html
 
+*.var
 
 verfile.sh
 
 Makefile
 
 copytgz.sh

+ 0 - 18
doc/html/index.html
Wyświetl plik 

@@ -1,18 +0,0 @@
 
-<html><title>3proxy documentation</title><body><h2>3proxy documentation</h2>
 
-<a href="securityen.html">Security recommendations</a><br>
 
-<a href="howtoe.html">How To (English, very incomplete)</a><br>
 
-<a href="howtor.html">How To (Russian, Windows1251)</a><br>
 
-<a href="faqe.html">FAQ (English)</a><br>
 
-<a href="faqr.html">FAQ (Russian, Windows1251)</a>
 
-<h3>Man pages:</h>
 
-<br><A HREF="man8/3proxy.8.html">3proxy.8</A>
 
-<br><A HREF="man8/ftppr.8.html">ftppr.8</A>
 
-<br><A HREF="man8/icqpr.8.html">icqpr.8</A>
 
-<br><A HREF="man8/pop3p.8.html">pop3p.8</A>
 
-<br><A HREF="man8/proxy.8.html">proxy.8</A>
 
-<br><A HREF="man8/smtpp.8.html">smtpp.8</A>
 
-<br><A HREF="man8/socks.8.html">socks.8</A>
 
-<br><A HREF="man8/tcppm.8.html">tcppm.8</A>
 
-<br><A HREF="man8/udppm.8.html">udppm.8</A>
 
-<br><A HREF="man3/3proxy.cfg.3.html">3proxy.cfg.3</A>
 
-</body></html>

+ 0 - 37
src/plugins/FilePlugin/Makefile.var
Wyświetl plik 

@@ -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 ..\..)
 
-

+ 0 - 37
src/plugins/LastFRipper/Makefile.var
Wyświetl plik 

@@ -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 ..\..)
 
-

+ 0 - 37
src/plugins/PCREPlugin/Makefile.var
Wyświetl plik 

@@ -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 ..\..)
 
-

+ 0 - 37
src/plugins/SSLPlugin/Makefile.var
Wyświetl plik 

@@ -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 ..\..)
 
-

+ 0 - 37
src/plugins/StringsPlugin/Makefile.var
Wyświetl plik 

@@ -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 ..\..)
 
-

+ 0 - 37
src/plugins/TrafficPlugin/Makefile.var
Wyświetl plik 

@@ -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 ..\..)
 
-

+ 0 - 35
src/plugins/TransparentPlugin/Makefile.var
Wyświetl plik 

@@ -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

+ 0 - 37
src/plugins/WindowsAuthentication/Makefile.var
Wyświetl plik 

@@ -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 ..\..)
 
-

+ 0 - 37
src/plugins/utf8tocp1251/Makefile.var
Wyświetl plik 

@@ -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 ..\..)
 
-

+ 2 - 2
src/version.h
Wyświetl plik 

@@ -1,2 +1,2 @@
 
-#define VERSION "3proxy-0.7"
 
-#define BUILDDATE "140408012613"
 
+#define VERSION "3proxy-0.8b-devel"
 
+#define BUILDDATE "140409014428"