cpp/openttd-patchpack/source Changeset - r22692:52017480c532

Changeset - r22692:52017480c532

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

adf88 - 7 years ago 2017-09-10 14:02:13
adf88@openttd.org

(svn r27913) -Fix: 'unban' console command was not handling IPv6 adresses properly

1 file changed with 17 insertions and 12 deletions:

src/console_cmds.cpp

0 comments (0 inline, 0 general)

src/console_cmds.cpp

➞

Show inline comments

@@ @@ -559,26 +559,31 @@ DEF_CONSOLE_CMD(ConUnBan) @@
 		IConsoleHelp("For a list of banned IP's, see the command 'banlist'");
 		return true;
+	}
 	if (argc != 2) return false;
 	uint index = (strchr(argv[1], '.') == NULL) ? atoi(argv[1]) : 0;
 	index--;
 	uint i = 0;
 	for (char **iter = _network_ban_list.Begin(); iter != _network_ban_list.End(); iter++, i++) {
 		if (strcmp(_network_ban_list[i], argv[1]) == 0 || index == i) {
 			free(_network_ban_list[i]);
 			_network_ban_list.Erase(iter);
 			IConsolePrint(CC_DEFAULT, "IP unbanned.");
 			return true;
+		}
 	/* Try by IP. */
 	uint index;
 	for (index = 0; index < _network_ban_list.Length(); index++) {
 		if (strcmp(_network_ban_list[index], argv[1]) == 0) break;
+	}
 	IConsolePrint(CC_DEFAULT, "IP not in ban-list.");
 	/* Try by index. */
 	if (index >= _network_ban_list.Length()) {
 		index = atoi(argv[1]) - 1U; // let it wrap
+	}
 	if (index < _network_ban_list.Length()) {
 		free(_network_ban_list[index]);
 		_network_ban_list.Erase(_network_ban_list.Get(index));
 		IConsolePrint(CC_DEFAULT, "IP unbanned.");
 	} else {
 		IConsolePrint(CC_DEFAULT, "IP not in ban-list.");
+	}
 	return true;
+}
 DEF_CONSOLE_CMD(ConBanList)
+{
 	if (argc == 0) {

0 comments (0 inline, 0 general)