Skip to content
Snippets Groups Projects
Commit 5250ddca authored by Logan Aerl Arias's avatar Logan Aerl Arias
Browse files

Merge branch 'fix-parse-ipv6-ban' into 'next'

Fix IPv6 bans being ignored when loading banlist

See merge request STJr/SRB2!2235
parents e70a4302 0131cdb0
Branches simplecam
No related tags found
No related merge requests found
...@@ -79,7 +79,7 @@ static void Ban_Clear(void) ...@@ -79,7 +79,7 @@ static void Ban_Clear(void)
void Ban_Load_File(boolean warning) void Ban_Load_File(boolean warning)
{ {
FILE *f; FILE *f;
const char *address, *mask; char *address, *mask;
char buffer[MAX_WADPATH]; char buffer[MAX_WADPATH];
if (!I_ClearBans) if (!I_ClearBans)
...@@ -100,6 +100,14 @@ void Ban_Load_File(boolean warning) ...@@ -100,6 +100,14 @@ void Ban_Load_File(boolean warning)
{ {
address = strtok(buffer, " \t\r\n"); address = strtok(buffer, " \t\r\n");
mask = strtok(NULL, " \t\r\n"); mask = strtok(NULL, " \t\r\n");
if (address[0] == '[')
{
size_t len;
address++;
len = strlen(address);
if (address[len-1] == ']')
address[len-1] = '\0';
}
I_SetBanAddress(address, mask); I_SetBanAddress(address, mask);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment