v1.2(development beta 1, patch 9)

1. Changed some structure's usage.
2. Fixed potiential issues after released the allocated memory.
3. Moved "runmode" config option to a command line option.
4. Replaced network library, for future support of IPv6.
5. Merged messages which previously splited, to fix potiential issues of log's mess.

Author: bilintsui

README.md

@@ -1,8 +1,11 @@
 # mcrelay
-Minecraft Relay Server<br/>
-A minecraft reverse proxy server with server address rewrite.<br/>
-Supports Minecraft Servers and Clients with version 12w04a or later. (Basically means release 1.2.1 and later.)<br/>
-Minecraft Versions before 12w04a are **NOT SUPPORTED**!<br/>
+Minecraft Relay Server
+
+A minecraft reverse proxy server with server address rewrite.
+
+Supports Minecraft Servers and Clients with version 12w04a or later. (Basically means release 1.2.1 and later.)
+
+Minecraft Versions before 12w04a are **NOT SUPPORTED**!
 
 ## Features
 * Support reverse proxy for Minecraft servers by server address in the handshake packet which client send to.
@@ -13,7 +16,8 @@ Minecraft Versions before 12w04a are **NOT SUPPORTED**!<br/>
 * libresolv.so
 
 ## Compatibility
-**Due to Minecraft Handshake restrictions, this server supports:**<br/>
+**Due to Minecraft Handshake restrictions, this server supports:**
+
 * Game relay on server & client with version 12w04a and later, except version 12w17a, 13w41a and 13w41b.
 * MOTD relay / MOTD status notice on server & client with version 1.6.1 and later, except version 13w41a and 13w41b.
 
@@ -40,10 +44,13 @@ make
 mcrelay < arguments | config_file >
 </pre>
 
+The program will run as a non-exit-style program by default.
+
+When using "-f" or "--forking" option, the program will become daemonized, and store its main process' PID into /tmp/mcrelay.pid.
+
 ## Config
 ### Format
 <pre>
-runmode run_mode
 log logfile_path
 loglevel loglvl
 bind bind_object
@@ -54,8 +61,6 @@ proxy_pass proxy_type
 default destination_object
 </pre>
 ### Explanation
-* runmode: set program's runmode.
->* run_mode: type of program's runmode, "simple" for a normal, non-exit program, "forking" for a daemonized program. In forking, it will store the PID in /tmp/mcrelay.pid.
 * log: set log file.
 >* logfile_path: path of the file which logs saved to.
 * loglevel: set max message level in logging message.
@@ -69,15 +74,17 @@ default destination_object
 >* ident_name: name of destination identification. Usually a Fully Qualified Domain Name(FQDN) by CNAME to your server.
 >* 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/>
-If SRV record resolve failed, it will fallback to normal address resolve, also connect to this address with port 25565.<br/>
+>>* port: optional, the port you wish to connect. Valid range: 1-65535.
+
+If not set, the server will detect SRV record first(defined in address_d).
+
+If SRV record resolve failed, it will fallback to normal address resolve, also connect to this address with port 25565.
+
 **For rewrite enabled relay, it will use actual connect configuration to rewrite.**
 >>* path: the socket file you wish to connect.
 * default: optional, set a default server to connect when client don't match any valid virtual host. (Intentionally not support rewrite here.) (Security suggestion: Don't use this feature unless you know what you are doing.)
 ### Example
 <pre>
-runmode forking
 log /var/log/mcrelay/mcrelay.log
 bind 0.0.0.0:25565
 proxy_pass rewrite
@@ -90,8 +97,10 @@ default 192.168.1.254:25565
 </pre>
 
 ## Instruction of using a DNS-based redirection(SRV)
-If you are using a SRV record to provide your service, you should follow the instructions below.<br/>
-Otherwise, your user will see the message of using a wrong address to connect.<br/>
+If you are using a SRV record to provide your service, you should follow the instructions below.
+
+Otherwise, your user will see the message of using a wrong address to connect.
+
 For example, your SRV record should be like this:
 <pre>
 _minecraft._tcp.srvrecord.example.com. => PRIVORITY WEIGHT PORT host.example.com

mcrelay.conf.example

@@ -1,4 +1,3 @@
-runmode run_mode
 log logfile_path
 loglevel loglvl
 bind bind_object

mcrelay.service.forking.example

@@ -9,7 +9,7 @@ Group=nogroup
 Restart=on-failure
 RestartSec=5s
 PID=/tmp/mcrelay.pid
-ExecStart=/usr/bin/mcrelay /etc/mcrelay/mcrelay.conf
+ExecStart=/usr/bin/mcrelay -f /etc/mcrelay/mcrelay.conf
 ExecStop=/usr/bin/mcrelay -t
 ExecReload=/usr/bin/mcrelay -r
 

mod/config.h

@@ -14,19 +14,37 @@
 #include "basic.h"
 #ifdef linux
 #define CONF_EOPENFILE 1
-#define CONF_EBADRUNMODE 2
-#define CONF_ENOLOGFILE 3
-#define CONF_ENOLOGLEVEL 4
-#define CONF_EINVALIDBIND 5
-#define CONF_EPROXYNOFIND 6
-#define CONF_EPROXYDUP 7
-#define CONF_EDEFPROXYDUP 8
-struct conf_bind;
-struct conf_map;
-struct conf;
-struct conf_map * getproxyinfo(struct conf * source, unsigned char * proxyname);
-void config_dump(struct conf * source);
-int config_load(char * filename, struct conf * result);
+#define CONF_ENOLOGFILE 2
+#define CONF_ENOLOGLEVEL 3
+#define CONF_EINVALIDBIND 4
+#define CONF_EPROXYNOFIND 5
+#define CONF_EPROXYDUP 6
+#define CONF_EDEFPROXYDUP 7
+typedef struct
+{
+	char inet_addr[BUFSIZ];
+	unsigned short inet_port;
+} conf_bind;
+typedef struct
+{
+	unsigned short enable_rewrite;
+	char from[512],to_inet_addr[512];
+	unsigned short to_inet_port;
+	unsigned short to_inet_hybridmode;
+} conf_map;
+typedef struct
+{
+	char log[512];
+	unsigned short loglevel;
+	conf_bind bind;
+	int relay_count;
+	conf_map relay[128];
+	int enable_default;
+	conf_map relay_default;
+} conf;
+conf_map * getproxyinfo(conf * source, unsigned char * proxyname);
+void config_dump(conf * source);
+int config_load(char * filename, conf * result);
 #include "linux/config.c"
 #endif
 #endif

mod/linux/basic.c

@@ -189,6 +189,7 @@ size_t freadall(unsigned char * filename, unsigned char ** dest)
 			if(result==NULL)
 			{
 				free(buffer);
+				buffer=NULL;
 				errno=FREADALL_ECALLOC;
 				return 0;
 			}
@@ -197,14 +198,17 @@ size_t freadall(unsigned char * filename, unsigned char ** dest)
 		if((total_size+read_size)>max_size)
 		{
 			free(buffer);
+			buffer=NULL;
 			free(result);
+			result=NULL;
 			errno=FREADALL_ELARGE;
 			return 0;
 		}
 		unsigned char * result_pre=realloc(result,total_size+read_size+1);
 		if(result_pre==NULL)
 		{
 			free(buffer);
+			buffer=NULL;
 			errno=FREADALL_EREALLOC;
 			return 0;
 		}
@@ -218,6 +222,7 @@ size_t freadall(unsigned char * filename, unsigned char ** dest)
 		}
 	}
 	free(buffer);
+	buffer=NULL;
 	*dest=result;
 	return total_size;
 }
@@ -246,6 +251,7 @@ unsigned char * base64_encode(unsigned char * source, size_t source_size)
 	if(target==NULL)
 	{
 		free(new_source);
+		new_source=NULL;
 		return NULL;
 	}
 	memset(target,0,target_size+1);
@@ -261,6 +267,7 @@ unsigned char * base64_encode(unsigned char * source, size_t source_size)
 		offset_target=offset_target+4;
 	}
 	free(new_source);
+	new_source=NULL;
 	if(endfix!=0)
 	{
 		memset(&(target[target_size-endfix]),'=',endfix);

mod/linux/config.c

@@ -14,32 +14,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-struct conf_bind
+conf_map * getproxyinfo(conf * source, unsigned char * proxyname)
 {
-	char inet_addr[BUFSIZ];
-	unsigned short inet_port;
-};
-struct conf_map
-{
-	unsigned short enable_rewrite;
-	char from[512],to_inet_addr[512];
-	unsigned short to_inet_port;
-	unsigned short to_inet_hybridmode;
-};
-struct conf
-{
-	unsigned short runmode;
-	char log[512];
-	unsigned short loglevel;
-	struct conf_bind bind;
-	int relay_count;
-	struct conf_map relay[128];
-	int enable_default;
-	struct conf_map relay_default;
-};
-struct conf_map * getproxyinfo(struct conf * source, unsigned char * proxyname)
-{
-	struct conf_map * result=NULL;
+	conf_map * result=NULL;
 	int proxyname_length=strlen(proxyname);
 	int detected_length=proxyname_length;
 	while(proxyname[detected_length-1]=='.')
@@ -66,18 +43,10 @@ struct conf_map * getproxyinfo(struct conf * source, unsigned char * proxyname)
 	real_proxyname=NULL;
 	return result;
 }
-void config_dump(struct conf * source)
+void config_dump(conf * source)
 {
 	printf("Config Detail:\n");
 	printf("\n[COMMON]\n");
-	switch(source->runmode)
-	{
-		case 1:
-			printf("Runmode\t\tSimple\n");
-			break;
-		case 2:
-			printf("Runmode\t\tForking\n");
-	}
 	printf("Log file\t%s\n",source->log);
 	printf("Log level\t%d\n",source->loglevel);
 	printf("Relay Count\t%d\n",source->relay_count);
@@ -135,7 +104,7 @@ void config_dump(struct conf * source)
 	}
 	printf("\n");
 }
-int config_load(char * filename, struct conf * result)
+int config_load(char * filename, conf * result)
 {
 	char rec_char,buffer[128][BUFSIZ],tmp_buffer[BUFSIZ],key[512],value[512],key2[512],value2[512];
 	char * tmpptr;
@@ -185,18 +154,7 @@ int config_load(char * filename, struct conf * result)
 		}
 		tmpptr=strsplit(tmpptr,' ',key);
 		tmpptr=strsplit(tmpptr,' ',value);
-		if(strcmp(key,"runmode")==0)
-		{
-			if(strcmp(value,"simple")==0)
-			{
-				result->runmode=1;
-			}
-			else if(strcmp(value,"forking")==0)
-			{
-				result->runmode=2;
-			}
-		}
-		else if(strcmp(key,"log")==0)
+		if(strcmp(key,"log")==0)
 		{
 			strcpy(result->log,value);
 		}
@@ -286,7 +244,7 @@ int config_load(char * filename, struct conf * result)
 		}
 		else if(strcmp(key,"default")==0)
 		{
-			struct conf_map relay_default;
+			conf_map relay_default;
 			bzero(&relay_default,sizeof(relay_default));
 			tmpptr=value;
 			if(result->enable_default==1)
@@ -326,10 +284,6 @@ int config_load(char * filename, struct conf * result)
 			result->enable_default=1;
 		}
 	}
-	if((result->runmode!=1)&&(result->runmode!=2))
-	{
-		return CONF_EBADRUNMODE;
-	}
 	if(strcmp(result->log,"")==0)
 	{
 		return CONF_ENOLOGFILE;