mirror of
				https://github.com/3proxy/3proxy.git
				synced 2025-11-04 07:42:39 +08:00 
			
		
		
		
	resolving conflicts
This commit is contained in:
		
							parent
							
								
									5c9bb58a81
								
							
						
					
					
						commit
						05b23a840e
					
				
							
								
								
									
										10
									
								
								src/proxy.h
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								src/proxy.h
									
									
									
									
									
								
							@ -30,16 +30,6 @@
 | 
			
		||||
#define _PASSWORD_LEN 256
 | 
			
		||||
#define MAXNSERVERS 5
 | 
			
		||||
 | 
			
		||||
#define ALLOW		0
 | 
			
		||||
#define DENY		1
 | 
			
		||||
#define REDIRECT	2
 | 
			
		||||
#define BANDLIM		3
 | 
			
		||||
#define NOBANDLIM	4
 | 
			
		||||
#define COUNTIN		5
 | 
			
		||||
#define NOCOUNTIN	6
 | 
			
		||||
#define COUNTOUT	7
 | 
			
		||||
#define NOCOUNTOUT	8
 | 
			
		||||
 | 
			
		||||
#define UDPBUFSIZE 16384
 | 
			
		||||
#define TCPBUFSIZE  8192
 | 
			
		||||
#define SRVBUFSIZE (param->srv->bufsize?param->srv->bufsize:((param->service == S_UDPPM)?UDPBUFSIZE:TCPBUFSIZE))
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user