v1.2(development beta 1, patch 8)

1. Removed feature "UNIX Socket".

Author: bilintsui

README.md

@@ -7,7 +7,6 @@ Minecraft Versions before 12w04a are **NOT SUPPORTED**!<br/>
 ## Features
 * Support reverse proxy for Minecraft servers by server address in the handshake packet which client send to.
 * Support rewrite server address and server port to camouflage connection which using official server address. (eg: pretend to be a normal connection to Hypixel, avoiding their server address check.)
-* Support listening on an UNIX socket or relay to an UNIX socket. (eg: using nginx as your front-end server, connnect to this UNIX socket.)
 
 ## Requirements
 * Linux
@@ -62,14 +61,13 @@ default destination_object
 * loglevel: set max message level in logging message.
 >* loglvl: a unsigned short integer, range 0-255. This program will not log message with level higher than this level. 0: Critical, 1: Warning, 2+: Information. For more information, watch loglevel.info.
 * bind: set bind information.
->* bind_object: (format: "address:port" or "unix:path") default: "0.0.0.0:25565".
+>* bind_object: (format: "address:port") default: "0.0.0.0:25565".
 >>* address: the address you wish to bind as an Internet Service. Only x.x.x.x allowed.
 >>* port: the port you wish to bind as an Internet Service. Valid range: 1-65535.
->>* path: the socket file you wish to bind as an UNIX Socket.
 * proxy_pass: list of relay/relay+rewrites.
 >* proxy_type: type of proxies, "relay" for raw relay, "rewrite" for relay with server address camouflage enabled.
 >* ident_name: name of destination identification. Usually a Fully Qualified Domain Name(FQDN) by CNAME to your server.
->* destination_object: (format: "address_d[:port]" or "unix:path")
+>* destination_object: (format: "address_d[:port]")
 >>* address_d: the address you wish to connect. Both FQDN or x.x.x.x allowed.
 >>* port: optional, the port you wish to connect. Valid range: 1-65535.<br/>
 If not set, the server will detect SRV record first(defined in address_d).<br/>

mod/basic.h

@@ -12,8 +12,6 @@
 #ifndef _MOD_BASIC_H_
 #define _MOD_BASIC_H_
 #ifdef linux
-#define TYPE_UNIX 1
-#define TYPE_INET 2
 #define PVER_L_UNIDENT 0
 #define PVER_L_ORIGPRO 1
 #define PVER_L_LEGACY1 2

mod/linux/config.c

@@ -16,15 +16,13 @@
 #include <string.h>
 struct conf_bind
 {
-	unsigned short type;
-	char unix_path[BUFSIZ],inet_addr[BUFSIZ];
+	char inet_addr[BUFSIZ];
 	unsigned short inet_port;
 };
 struct conf_map
 {
 	unsigned short enable_rewrite;
-	char from[512],to_unix_path[512],to_inet_addr[512];
-	unsigned short to_type;
+	char from[512],to_inet_addr[512];
 	unsigned short to_inet_port;
 	unsigned short to_inet_hybridmode;
 };
@@ -93,18 +91,8 @@ void config_dump(struct conf * source)
 			break;
 	}
 	printf("\n[BIND]\n");
-	switch(source->bind.type)
-	{
-		case TYPE_UNIX:
-			printf("Type\t\tUNIX Socket\n");
-			printf("Path\t\t%s\n",source->bind.unix_path);
-			break;
-		case TYPE_INET:
-			printf("Type\t\tInternet Socket\n");
-			printf("Address\t\t%s\n",source->bind.inet_addr);
-			printf("Port\t\t%d\n",source->bind.inet_port);
-			break;
-	}
+	printf("Address\t\t%s\n",source->bind.inet_addr);
+	printf("Port\t\t%d\n",source->bind.inet_port);
 	for(int i=0;i<source->relay_count;i++)
 	{
 		printf("\n[RELAY #%d]\n",i+1);
@@ -118,50 +106,30 @@ void config_dump(struct conf * source)
 				break;
 		}
 		printf("vhost\t\t%s\n",source->relay[i].from);
-		switch(source->relay[i].to_type)
+		printf("Address\t\t%s\n",source->relay[i].to_inet_addr);
+		switch(source->relay[i].to_inet_hybridmode)
 		{
-			case TYPE_UNIX:
-				printf("Type\t\tUNIX Socket\n");
-				printf("Path\t\t%s\n",source->relay[i].to_unix_path);
+			case 0:
+				printf("Port\t\t%d\n",source->relay[i].to_inet_port);
+				printf("SRV Resolve\tDisabled\n");
 				break;
-			case TYPE_INET:
-				printf("Type\t\tInternet Socket\n");
-				printf("Address\t\t%s\n",source->relay[i].to_inet_addr);
-				switch(source->relay[i].to_inet_hybridmode)
-				{
-					case 0:
-						printf("Port\t\t%d\n",source->relay[i].to_inet_port);
-						printf("SRV Resolve\tDisabled\n");
-						break;
-					case 1:
-						printf("SRV Resolve\tEnabled\n");
-						break;
-				}
+			case 1:
+				printf("SRV Resolve\tEnabled\n");
 				break;
 		}
 	}
 	if(source->enable_default==1)
 	{
 		printf("\n[DEFAULT RELAY]\n");
-		switch(source->relay_default.to_type)
+		printf("Address\t\t%s\n",source->relay_default.to_inet_addr);
+		switch(source->relay_default.to_inet_hybridmode)
 		{
-			case TYPE_UNIX:
-				printf("Type\t\tUNIX Socket\n");
-				printf("Path\t%s\n",source->relay_default.to_unix_path);
+			case 0:
+				printf("Port\t\t%d\n",source->relay_default.to_inet_port);
+				printf("SRV Resolve\tDisabled\n");
 				break;
-			case TYPE_INET:
-				printf("Type\t\tInternet Socket\n");
-				printf("Address\t\t%s\n",source->relay_default.to_inet_addr);
-				switch(source->relay_default.to_inet_hybridmode)
-				{
-					case 0:
-						printf("Port\t\t%d\n",source->relay_default.to_inet_port);
-						printf("SRV Resolve\tDisabled\n");
-						break;
-					case 1:
-						printf("SRV Resolve\tEnabled\n");
-						break;
-				}
+			case 1:
+				printf("SRV Resolve\tEnabled\n");
 				break;
 		}
 	}
@@ -245,17 +213,8 @@ int config_load(char * filename, struct conf * result)
 			tmpptr=value;
 			tmpptr=strsplit(tmpptr,':',key2);
 			tmpptr=strsplit(tmpptr,':',value2);
-			if(strcmp(key2,"unix")==0)
-			{
-				result->bind.type=TYPE_UNIX;
-				strcpy(result->bind.unix_path,value2);
-			}
-			else
-			{
-				result->bind.type=TYPE_INET;
-				strcpy(result->bind.inet_addr,key2);
-				result->bind.inet_port=basic_atosu(value2);
-			}
+			strcpy(result->bind.inet_addr,key2);
+			result->bind.inet_port=basic_atosu(value2);
 		}
 		else if(strcmp(key,"proxy_pass")==0)
 		{
@@ -292,7 +251,6 @@ int config_load(char * filename, struct conf * result)
 				}
 				if(strsplit_fieldcount(tmpptr,':')==1)
 				{
-					result->relay[rec_relay].to_type=TYPE_INET;
 					result->relay[rec_relay].to_inet_hybridmode=1;
 					tmpptr=strsplit(tmpptr,':',result->relay[rec_relay].to_inet_addr);
 					result->relay[rec_relay].to_inet_port=25565;
@@ -307,26 +265,17 @@ int config_load(char * filename, struct conf * result)
 				bzero(value2,sizeof(value2));
 				tmpptr=strsplit(tmpptr,':',key2);
 				tmpptr=strsplit(tmpptr,':',value2);
-				if(strcmp(key2,"unix")==0)
+				strcpy(result->relay[rec_relay].to_inet_addr,key2);
+				int port=basic_atosu(value2);
+				if(port==0)
 				{
-					result->relay[rec_relay].to_type=TYPE_UNIX;
-					strcpy(result->relay[rec_relay].to_unix_path,value2);
+					line_reccount++;
+					strcpy(tmp_buffer,buffer[line_reccount+1]);
+					continue;
 				}
 				else
 				{
-					result->relay[rec_relay].to_type=TYPE_INET;
-					strcpy(result->relay[rec_relay].to_inet_addr,key2);
-					int port=basic_atosu(value2);
-					if(port==0)
-					{
-						line_reccount++;
-						strcpy(tmp_buffer,buffer[line_reccount+1]);
-						continue;
-					}
-					else
-					{
-						result->relay[rec_relay].to_inet_port=port;
-					}
+					result->relay[rec_relay].to_inet_port=port;
 				}
 				rec_relay++;
 				line_reccount++;
@@ -350,7 +299,6 @@ int config_load(char * filename, struct conf * result)
 			if(strsplit_fieldcount(tmpptr,':')==1)
 			{
 				relay_default.to_inet_hybridmode=1;
-				relay_default.to_type=TYPE_INET;
 				tmpptr=strsplit(tmpptr,':',relay_default.to_inet_addr);
 				relay_default.to_inet_port=25565;
 			}
@@ -359,24 +307,15 @@ int config_load(char * filename, struct conf * result)
 				relay_default.to_inet_hybridmode=0;
 				tmpptr=strsplit(tmpptr,':',key2);
 				tmpptr=strsplit(tmpptr,':',value2);
-				if(strcmp(key2,"unix")==0)
+				strcpy(relay_default.to_inet_addr,key2);
+				int port=basic_atosu(value2);
+				if(port==0)
 				{
-					relay_default.to_type=TYPE_UNIX;
-					strcpy(relay_default.to_unix_path,value2);
+					continue;
 				}
 				else
 				{
-					relay_default.to_type=TYPE_INET;
-					strcpy(relay_default.to_inet_addr,key2);
-					int port=basic_atosu(value2);
-					if(port==0)
-					{
-						continue;
-					}
-					else
-					{
-						relay_default.to_inet_port=port;
-					}
+					relay_default.to_inet_port=port;
 				}
 			}
 			else
@@ -399,7 +338,7 @@ int config_load(char * filename, struct conf * result)
 	{
 		return CONF_ENOLOGLEVEL;
 	}
-	if(!((strcmp(result->bind.unix_path,"")!=0)||((strcmp(result->bind.inet_addr,"")!=0)&&(inet_addr(result->bind.inet_addr)!=-1)&&(result->bind.inet_port!=0))))
+	if(!(((strcmp(result->bind.inet_addr,"")!=0)&&(inet_addr(result->bind.inet_addr)!=-1)&&(result->bind.inet_port!=0))))
 	{
 		return CONF_EINVALIDBIND;
 	}

mod/linux/main.c

@@ -20,7 +20,7 @@
 #include <unistd.h>
 const char * version_str="1.2-beta1";
 const char * year_str="2020-2021";
-const short version_internal=43;
+const short version_internal=44;
 struct conf config;
 char configfile[512],cwd[512],config_logfull[BUFSIZ];
 unsigned short config_runmode;
@@ -83,7 +83,6 @@ int main(int argc, char ** argv)
 {
 	int socket_inbound_server,strulen,socket_inbound_client;
 	struct sockaddr_in addr_inbound_server,addr_inbound_client;
-	struct sockaddr_un uddr_inbound_server,uddr_inbound_client;
 	signal(SIGTERM,deal_sigterm);
 	signal(SIGINT,deal_sigterm);
 	bzero(cwd,512);
@@ -222,54 +221,32 @@ int main(int argc, char ** argv)
 	{
 		fclose(tmpfd);
 	}
-	if(config.bind.type==TYPE_INET)
+	socket_inbound_server=socket(AF_INET,SOCK_STREAM,0);
+	int socket_inbound_server_opt=1;
+	setsockopt(socket_inbound_server,SOL_SOCKET,SO_REUSEADDR,&socket_inbound_server_opt,sizeof(socket_inbound_server_opt));
+	in_addr_t bindaddr=0;
+	if(inet_pton(AF_INET,config.bind.inet_addr,&bindaddr))
 	{
-		socket_inbound_server=socket(AF_INET,SOCK_STREAM,0);
-		int socket_inbound_server_opt=1;
-		setsockopt(socket_inbound_server,SOL_SOCKET,SO_REUSEADDR,&socket_inbound_server_opt,sizeof(socket_inbound_server_opt));
-		in_addr_t bindaddr=0;
-		if(inet_pton(AF_INET,config.bind.inet_addr,&bindaddr))
-		{
-			addr_inbound_server=net_mksockaddr_in(AF_INET,&bindaddr,config.bind.inet_port);
-		}
-		else
-		{
-			mksysmsg(0,config_logfull,config_runmode,config.loglevel,0,"Error: Invalid bind address!\n");
-			return 14;
-		}
-		if(config.bind.inet_port==0)
-		{
-			mksysmsg(0,config_logfull,config_runmode,config.loglevel,0,"Error: Invalid bind port!\n");
-			return 14;
-		}
-		strulen=sizeof(struct sockaddr_in);
-		mksysmsg(0,config_logfull,config_runmode,config.loglevel,2,"Binding on %s:%d...\n",config.bind.inet_addr,config.bind.inet_port);
-		if(bind(socket_inbound_server,(struct sockaddr *)&addr_inbound_server,strulen)==-1)
-		{
-			mksysmsg(0,config_logfull,config_runmode,config.loglevel,0,"Bind Failed!\n");
-			return 2;
-		}
-		mksysmsg(0,config_logfull,config_runmode,config.loglevel,2,"Bind Successful.\n\n");
+		addr_inbound_server=net_mksockaddr_in(AF_INET,&bindaddr,config.bind.inet_port);
 	}
-	else if(config.bind.type==TYPE_UNIX)
+	else
 	{
-		unlink(config.bind.unix_path);
-		socket_inbound_server=socket(AF_UNIX,SOCK_STREAM,0);
-		uddr_inbound_server=net_mksockaddr_un(config.bind.unix_path);
-		strulen=sizeof(uddr_inbound_server);
-		mksysmsg(0,config_logfull,config_runmode,config.loglevel,2,"Binding on %s...\n",uddr_inbound_server.sun_path);
-		if(bind(socket_inbound_server,(struct sockaddr *)&uddr_inbound_server,strulen)==-1)
-		{
-			mksysmsg(0,config_logfull,config_runmode,config.loglevel,0,"Bind Failed!\n");
-			return 2;
-		}
-		if(chmod(config.bind.unix_path,S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH)==-1)
-		{
-			mksysmsg(0,config_logfull,config_runmode,config.loglevel,0,"Set Permission Failed!\n");
-			return 13;
-		}
-		mksysmsg(0,config_logfull,config_runmode,config.loglevel,2,"Bind Successful.\n\n");
+		mksysmsg(0,config_logfull,config_runmode,config.loglevel,0,"Error: Invalid bind address!\n");
+		return 14;
+	}
+	if(config.bind.inet_port==0)
+	{
+		mksysmsg(0,config_logfull,config_runmode,config.loglevel,0,"Error: Invalid bind port!\n");
+		return 14;
 	}
+	strulen=sizeof(struct sockaddr_in);
+	mksysmsg(0,config_logfull,config_runmode,config.loglevel,2,"Binding on %s:%d...\n",config.bind.inet_addr,config.bind.inet_port);
+	if(bind(socket_inbound_server,(struct sockaddr *)&addr_inbound_server,strulen)==-1)
+	{
+		mksysmsg(0,config_logfull,config_runmode,config.loglevel,0,"Bind Failed!\n");
+		return 2;
+	}
+	mksysmsg(0,config_logfull,config_runmode,config.loglevel,2,"Bind Successful.\n\n");
 	mksysmsg(0,"",config_runmode,config.loglevel,2,"For more information, watch log file: %s\n\n",config.log);
 	int pid;
 	if(config_runmode==2)
@@ -306,14 +283,7 @@ int main(int argc, char ** argv)
 	while(1)
 	{
 		while(listen(socket_inbound_server,1)==-1);
-		if(config.bind.type==TYPE_INET)
-		{
-			socket_inbound_client=accept(socket_inbound_server,(struct sockaddr *)&addr_inbound_client,&strulen);
-		}
-		else if(config.bind.type==TYPE_UNIX)
-		{
-			socket_inbound_client=accept(socket_inbound_server,(struct sockaddr *)&uddr_inbound_client,&strulen);
-		}
+		socket_inbound_client=accept(socket_inbound_server,(struct sockaddr *)&addr_inbound_client,&strulen);
 		pid=fork();
 		if(pid>0)
 		{