From 0977b555f3d745b81053930b2e8c3c85f1b8337e Mon Sep 17 00:00:00 2001
From: Adam Olsen <rhamph@gmail.com>
Date: Thu, 20 Sep 2001 06:51:25 +0000
Subject: [PATCH] - build fix for without curses (untested, but should fix the
 problem I   had when I last tried) - fix sv_filter_automask so it's not
 inverted (doh, again!) - cleanups of ip filter prints

---
 libs/console/server.c |  2 +-
 qw/source/sv_main.c   | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/libs/console/server.c b/libs/console/server.c
index 90d80a533..929222328 100644
--- a/libs/console/server.c
+++ b/libs/console/server.c
@@ -112,8 +112,8 @@ C_Init (void)
 {
 	cvar_t     *curses = Cvar_Get ("sv_use_curses", "1", CVAR_ROM, NULL,
 								   "set to 0 to disable curses server console");
-	use_curses = curses->int_val;
 #ifdef HAVE_CURSES_H
+	use_curses = curses->int_val;
 	if (use_curses) {
 		initscr ();
 		start_color ();
diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c
index 97a32510a..54927b203 100644
--- a/qw/source/sv_main.c
+++ b/qw/source/sv_main.c
@@ -1247,14 +1247,15 @@ SV_StringToFilter (const char *address, ipfilter_t *f)
 
 		// change trailing 0 segments to be a mask, eg 1.2.0.0 gives a /16 mask
 		if (mask == -1) {
-			mask = 0;
 			if (sv_filter_automask->int_val) {
+				mask = sizeof (b) * 8;
 				i = sizeof (b) - 1;
 				while (i >= 0 && !b[i]) {
-					mask += 8;
+					mask -= 8;
 					i--;
 				}
-			}
+			} else
+				mask = 0;
 		}
 #ifdef HAVE_IPV6
 	}
@@ -1300,7 +1301,7 @@ SV_CleanIPList (void)
 	char		*type;
 
 	for (i = 0; i < numipfilters;) {
-		if (ipfilters[i].time && (ipfilters[i].time < realtime)) {
+		if (ipfilters[i].time && (ipfilters[i].time <= realtime)) {
 			switch (ipfilters[i].type) {
 				case ft_ban: type = "Ban"; break;
 				case ft_mute: type = "Mute"; break;
@@ -1396,6 +1397,9 @@ SV_AddIP_f (void)
 				// FIXME: print on the console too
 			}
 		}
+		SV_Printf ("Added IP Filter for %s/%u\n",
+				   SV_PrintIP (ipfilters[numipfilters].ip),
+				   ipfilters[numipfilters].mask);
 		numipfilters++;
 	}
 }
@@ -1411,10 +1415,11 @@ SV_RemoveIP_f (void)
 	for (i = 0; i < numipfilters; i++)
 		if (ipfilters[i].mask == f.mask && SV_IPCompare (ipfilters[i].ip, f.ip)) {
 			SV_RemoveIPFilter (i);
-			SV_Printf ("Removed.\n");
+			SV_Printf ("Removed IP Filter for %s/%u.\n",
+					   SV_PrintIP (f.ip), f.mask);
 			return;
 		}
-	SV_Printf ("Didn't find %s.\n", Cmd_Argv (1));
+	SV_Printf ("Didn't find %s/%u.\n", SV_PrintIP (f.ip), f.mask);
 }
 
 void
@@ -1424,7 +1429,7 @@ SV_ListIP_f (void)
 	char		*type;
 	char		timestr[30];
 
-	SV_Printf ("Filter list:\n");
+	SV_Printf ("IP Filter list:\n");
 	for (i = 0; i < numipfilters; i++) {
 		switch (ipfilters[i].type) {
 			case ft_ban: type = "Ban:"; break;
@@ -1442,6 +1447,8 @@ SV_ListIP_f (void)
 		SV_Printf ("%-5s %-10s %s/%u\n", type, timestr,
 				   SV_PrintIP (ipfilters[i].ip), ipfilters[i].mask);
 	}
+	SV_Printf ("%d IP Filter%s\n", numipfilters,
+			   numipfilters == 1 ? "" : "s");
 }
 
 void
@@ -1454,7 +1461,7 @@ SV_WriteIP_f (void)
 
 	snprintf (name, sizeof (name), "%s/listip.cfg", com_gamedir);
 
-	SV_Printf ("Writing %s.\n", name);
+	SV_Printf ("Writing IP Filters to %s.\n", name);
 
 	f = Qopen (name, "wb");
 	if (!f) {