v1.1.5

bilintsui · bilintsui · commit d818f96bfa21 · 2021-06-04T18:15:17.000+08:00
1. Fixed memory leak issue when searching proxy list.
2. Changed "version.json".
diff --git a/mcrelay.c b/mcrelay.c
@@ -2,7 +2,7 @@
 	mcrelay.c: Universal enterance for Minecraft Relay Server
 	A component of Minecraft Relay Server.
 
-	Minecraft Relay Server, version 1.1.4
+	Minecraft Relay Server, version 1.1.5
 	Copyright (c) 2020-2021 Bilin Tsui. All right reserved.
 	This is a Free Software, absolutely no warranty.
 
diff --git a/mod/basic.h b/mod/basic.h
@@ -2,7 +2,7 @@
 	basic.h: Header file of basic.c
 	A component of Minecraft Relay Server.
 
-	Minecraft Relay Server, version 1.1.4
+	Minecraft Relay Server, version 1.1.5
 	Copyright (c) 2020-2021 Bilin Tsui. All right reserved.
 	This is a Free Software, absolutely no warranty.
 
diff --git a/mod/config.h b/mod/config.h
@@ -2,7 +2,7 @@
 	config.h: Header file of config.c
 	A component of Minecraft Relay Server.
 
-	Minecraft Relay Server, version 1.1.4
+	Minecraft Relay Server, version 1.1.5
 	Copyright (c) 2020-2021 Bilin Tsui. All right reserved.
 	This is a Free Software, absolutely no warranty.
 
diff --git a/mod/linux/basic.c b/mod/linux/basic.c
@@ -2,7 +2,7 @@
 	basic.c: Basic Functions for Minecraft Relay Server
 	A component of Minecraft Relay Server.
 
-	Minecraft Relay Server, version 1.1.4
+	Minecraft Relay Server, version 1.1.5
 	Copyright (c) 2020-2021 Bilin Tsui. All right reserved.
 	This is a Free Software, absolutely no warranty.
 
diff --git a/mod/linux/config.c b/mod/linux/config.c
@@ -2,7 +2,7 @@
 	config.c: Functions for Config reading on Minecraft Relay Server
 	A component of Minecraft Relay Server.
 
-	Minecraft Relay Server, version 1.1.4
+	Minecraft Relay Server, version 1.1.5
 	Copyright (c) 2020-2021 Bilin Tsui. All right reserved.
 	This is a Free Software, absolutely no warranty.
 
@@ -41,8 +41,9 @@ struct conf
 };
 struct conf_map * getproxyinfo(struct conf * source, unsigned char * proxyname)
 {
+	struct conf_map * result=NULL;
 	int proxyname_length=strlen(proxyname);
-	int detected_length = proxyname_length;
+	int detected_length=proxyname_length;
 	while(proxyname[detected_length-1]=='.')
 	{
 		detected_length--;
@@ -59,12 +60,13 @@ struct conf_map * getproxyinfo(struct conf * source, unsigned char * proxyname)
 	{
 		if(strcmp(source->relay[recidx].from,real_proxyname)==0)
 		{
-			free(real_proxyname);
-			real_proxyname=NULL;
-			return &(source->relay[recidx]);
+			result=&(source->relay[recidx]);
+			break;
 		}
 	}
-	return NULL;
+	free(real_proxyname);
+	real_proxyname=NULL;
+	return result;
 }
 void config_dump(struct conf * source)
 {
diff --git a/mod/linux/main.c b/mod/linux/main.c
@@ -2,7 +2,7 @@
 	main.c: Main source code for Minecraft Relay Server
 	A component of Minecraft Relay Server.
 
-	Minecraft Relay Server, version 1.1.4
+	Minecraft Relay Server, version 1.1.5
 	Copyright (c) 2020-2021 Bilin Tsui. All right reserved.
 	This is a Free Software, absolutely no warranty.
 
@@ -18,9 +18,9 @@
 #include <sys/stat.h>
 #include <sys/un.h>
 #include <unistd.h>
-const char * version_str="1.1.4";
+const char * version_str="1.1.5";
 const char * year_str="2020-2021";
-const short version_internal=39;
+const short version_internal=40;
 struct conf config;
 char configfile[512],cwd[512],config_logfull[BUFSIZ];
 unsigned short config_runmode;
diff --git a/mod/linux/misc.c b/mod/linux/misc.c
@@ -2,7 +2,7 @@
 	misc.c: Misc Functions for Minecraft Relay Server
 	A component of Minecraft Relay Server.
 
-	Minecraft Relay Server, version 1.1.4
+	Minecraft Relay Server, version 1.1.5
 	Copyright (c) 2020-2021 Bilin Tsui. All right reserved.
 	This is a Free Software, absolutely no warranty.
 
diff --git a/mod/linux/network.c b/mod/linux/network.c
@@ -2,7 +2,7 @@
 	network.c: Network Functions for Minecraft Relay Server
 	A component of Minecraft Relay Server.
 
-	Minecraft Relay Server, version 1.1.4
+	Minecraft Relay Server, version 1.1.5
 	Copyright (c) 2020-2021 Bilin Tsui. All right reserved.
 	This is a Free Software, absolutely no warranty.
 
diff --git a/mod/linux/proto_legacy.c b/mod/linux/proto_legacy.c
@@ -2,7 +2,7 @@
 	proto_legacy.c: Functions for Legacy Protocol (13w39b and before) on Minecraft Relay Server
 	A component of Minecraft Relay Server.
 
-	Minecraft Relay Server, version 1.1.4
+	Minecraft Relay Server, version 1.1.5
 	Copyright (c) 2020-2021 Bilin Tsui. All right reserved.
 	This is a Free Software, absolutely no warranty.
 
diff --git a/mod/linux/proto_modern.c b/mod/linux/proto_modern.c
@@ -2,7 +2,7 @@
 	proto_modern.c: Functions for Modern Protocol (13w41a and later) on Minecraft Relay Server
 	A component of Minecraft Relay Server.
 
-	Minecraft Relay Server, version 1.1.4
+	Minecraft Relay Server, version 1.1.5
 	Copyright (c) 2020-2021 Bilin Tsui. All right reserved.
 	This is a Free Software, absolutely no warranty.
 
diff --git a/mod/main.h b/mod/main.h
@@ -2,7 +2,7 @@
 	main.h: Header file of main.c
 	A component of Minecraft Relay Server.
 
-	Minecraft Relay Server, version 1.1.4
+	Minecraft Relay Server, version 1.1.5
 	Copyright (c) 2020-2021 Bilin Tsui. All right reserved.
 	This is a Free Software, absolutely no warranty.
 
diff --git a/mod/misc.h b/mod/misc.h
@@ -2,7 +2,7 @@
 	misc.h: Header file of misc.c
 	A component of Minecraft Relay Server.
 
-	Minecraft Relay Server, version 1.1.4
+	Minecraft Relay Server, version 1.1.5
 	Copyright (c) 2020-2021 Bilin Tsui. All right reserved.
 	This is a Free Software, absolutely no warranty.
 
diff --git a/mod/network.h b/mod/network.h
@@ -2,7 +2,7 @@
 	network.h: Header file of network.c
 	A component of Minecraft Relay Server.
 
-	Minecraft Relay Server, version 1.1.4
+	Minecraft Relay Server, version 1.1.5
 	Copyright (c) 2020-2021 Bilin Tsui. All right reserved.
 	This is a Free Software, absolutely no warranty.
 
diff --git a/mod/proto_legacy.h b/mod/proto_legacy.h
@@ -2,7 +2,7 @@
 	proto_legacy.h: Header file of proto_legacy.c
 	A component of Minecraft Relay Server.
 
-	Minecraft Relay Server, version 1.1.4
+	Minecraft Relay Server, version 1.1.5
 	Copyright (c) 2020-2021 Bilin Tsui. All right reserved.
 	This is a Free Software, absolutely no warranty.
 
diff --git a/mod/proto_modern.h b/mod/proto_modern.h
@@ -2,7 +2,7 @@
 	proto_modern.h: Header file of proto_modern.c
 	A component of Minecraft Relay Server.
 
-	Minecraft Relay Server, version 1.1.4
+	Minecraft Relay Server, version 1.1.5
 	Copyright (c) 2020-2021 Bilin Tsui. All right reserved.
 	This is a Free Software, absolutely no warranty.
 
diff --git a/version.json b/version.json
@@ -146,5 +146,9 @@
 	{
 		"version": 39,
 		"names": ["1.1.4-patch2","1.1.4"]
+	},
+	{
+		"version": 40,
+		"names": ["1.1.5"]
 	}
 ]

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`config.c: Functions for Config reading on Minecraft Relay Server`
`3`	`3`	`A component of Minecraft Relay Server.`
`4`	`4`
`5`		`- Minecraft Relay Server, version 1.1.4`
	`5`	`+ Minecraft Relay Server, version 1.1.5`
`6`	`6`	`Copyright (c) 2020-2021 Bilin Tsui. All right reserved.`
`7`	`7`	`This is a Free Software, absolutely no warranty.`
`8`	`8`
`@@ -41,8 +41,9 @@ struct conf`
`41`	`41`	`};`
`42`	`42`	`struct conf_map * getproxyinfo(struct conf * source, unsigned char * proxyname)`
`43`	`43`	`{`
	`44`	`+ struct conf_map * result=NULL;`
`44`	`45`	`int proxyname_length=strlen(proxyname);`
`45`		`- int detected_length = proxyname_length;`
	`46`	`+ int detected_length=proxyname_length;`
`46`	`47`	`while(proxyname[detected_length-1]=='.')`
`47`	`48`	`{`
`48`	`49`	`detected_length--;`
`@@ -59,12 +60,13 @@ struct conf_map * getproxyinfo(struct conf * source, unsigned char * proxyname)`
`59`	`60`	`{`
`60`	`61`	`if(strcmp(source->relay[recidx].from,real_proxyname)==0)`
`61`	`62`	`{`
`62`		`- free(real_proxyname);`
`63`		`- real_proxyname=NULL;`
`64`		`- return &(source->relay[recidx]);`
	`63`	`+ result=&(source->relay[recidx]);`
	`64`	`+ break;`
`65`	`65`	`}`
`66`	`66`	`}`
`67`		`- return NULL;`
	`67`	`+ free(real_proxyname);`
	`68`	`+ real_proxyname=NULL;`
	`69`	`+ return result;`
`68`	`70`	`}`
`69`	`71`	`void config_dump(struct conf * source)`
`70`	`72`	`{`